facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

watchmanclient: write watchman commands to tracing data

Browse Source 
Summary: This allows us to query tracing data for watchman commands.

Reviewed By: DurhamG

Differential Revision: D19797711

fbshipit-source-id: 4dfd50fff820da70888faa0fe8f53af25f205137
This commit is contained in:
Jun Wu 2020-05-12 10:46:08 -07:00 committed by Facebook GitHub Bot
parent 1e64eb89b9
commit cb9d8cde50
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
eden/scm/edenscm/hgext/extlib/watchmanclient/__init__.py
View File

@ -13,7 +13,7 @@ import os
import sys
from bindings import tracing
from edenscm.mercurial import blackbox, encoding, progress, pycompat, util
from edenscm.mercurial import blackbox, encoding, json, progress, pycompat, util
from edenscm.mercurial.node import hex
from .. import pywatchman
@ -128,6 +128,12 @@ class client(object):
return None
def _command(self, *args):
with util.traced("watchman-command", args=json.dumps(args[1:])) as span:
return self._retrycommand(span, 0, *args)
def _retrycommand(self, span, retry, *args):
if retry > 0:
span.record(retry=retry)
watchmanargs = (args[0], self._resolved_root) + args[1:]
error = None
needretry = False
@ -151,6 +157,7 @@ class client(object):
return self._watchmanclient.query(*watchmanargs)
except pywatchman.CommandError as ex:
error = ex.msg
span.record(error=ex.msg)
if "unable to resolve root" in ex.msg:
raise WatchmanNoRoot(self._resolved_root, ex.msg)
raise Unavailable(ex.msg)
@ -164,6 +171,7 @@ class client(object):
# clear the pre-configured sockpath so that the client will probe
# and start it up.
if not self._ui.config("fsmonitor", "sockpath") or self._sockpath is None:
span.record(error=error)
# Either sockpath wasn't configured, or we already tried clearing
# it out, so let's propagate this error.
raise Unavailable(str(ex))
@ -174,6 +182,7 @@ class client(object):
needretry = True
except pywatchman.WatchmanError as ex:
error = str(ex)
span.record(error=error)
raise Unavailable(str(ex))
finally:
event = {
@ -186,7 +195,7 @@ class client(object):
event["watchman"]["result"] = {"error": error}
blackbox.log(event)
if needretry:
return self._command(*args)
return self._retrycommand(span, retry + 1, *args)
@util.timefunction("watchmanquery", 0, "_ui")
def command(self, *args, **kwargs):