raise unmount thrift call timeout for eden rm

Summary: Unmounting can take some time (especially since we're seeing frequent thrift queue timeouts). Let's raise the timeout a bit and give the user a warning message that it may take longer than usual.

Reviewed By: fanzeyi

Differential Revision: D40113277

fbshipit-source-id: d96d909d8ff66e23d2f7862584a3d0556aecc72d
This commit is contained in:
Michael Cuevas 2022-10-06 19:19:25 -07:00 committed by Facebook GitHub Bot
parent 407c4882e6
commit 1476e6d83b
2 changed files with 4 additions and 2 deletions

View File

@ -773,7 +773,7 @@ Do you want to run `eden mount %s` instead?"""
#
# For now at least time out here so the CLI commands do not hang in this
# case.
with self.get_thrift_client_legacy(timeout=15) as client:
with self.get_thrift_client_legacy(timeout=60) as client:
client.unmount(os.fsencode(path))
def get_handle_path(self) -> Optional[Path]:

View File

@ -1456,7 +1456,9 @@ Any uncommitted changes and shelves in this checkout will be lost forever."""
# unmounting could still timeout, though we unmount with -f,
# so should this theoretically should not happen.
try:
print(f"Unmounting {mount}...")
print(
f"Unmounting `{mount}`. Please be patient: this can take up to 1 minute!"
)
instance.unmount(mount)
except EdenNotRunningError:
# Its fine if we could not tell the daemon to unmount