Skip to content

Commit 3229bc0

Browse files
kavehahmadi60meta-codesync[bot]
authored andcommitted
backout the get_thrift_client from EdenInstance in CLI
Summary: This is the backout of the changes in D90543765 The `from eden.fs.service.eden.thrift_clients import EdenService` failed for some eden CLI commands including `eden doctor` It only happen on macOS and Windows. The CLI command complain about `ModuleNotFoundError: No module named 'folly.iobuf'` Differential Revision: D91702771 fbshipit-source-id: 5c2fa2133dbbb7b4a74a618982364f4efd9d204b
1 parent b34cf36 commit 3229bc0

2 files changed

Lines changed: 1 addition & 15 deletions

File tree

eden/fs/cli/BUCK

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ python_library(
186186
"//eden/fs/cli/facebook:rage",
187187
"//eden/fs/inodes/overlay:serialization-py-deprecated",
188188
"//eden/fs/py/eden:dirstate",
189-
"//eden/fs/py/eden/thrift:client",
190189
"//eden/fs/py/eden/thrift:legacy",
191190
"//eden/fs/service:thrift-py-deprecated",
192191
"//eden/scm:redact",

eden/fs/cli/config.py

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,12 @@
2323
import time
2424
import typing
2525
import uuid
26-
from contextlib import contextmanager
2726
from enum import Enum
2827
from pathlib import Path
2928
from typing import (
3029
Any,
3130
Callable,
3231
Dict,
33-
Generator,
3432
IO,
3533
KeysView,
3634
List,
@@ -43,8 +41,7 @@
4341

4442
import facebook.eden.ttypes as eden_ttypes
4543
import toml
46-
from eden.fs.service.eden.thrift_clients import EdenService
47-
from eden.thrift import client, legacy
44+
from eden.thrift import legacy
4845
from eden.thrift.legacy import EdenNotRunningError
4946
from facebook.eden.ttypes import MountInfo as ThriftMountInfo, MountState
5047
from filelock import BaseFileLock, FileLock
@@ -545,16 +542,6 @@ def get_thrift_client_legacy(
545542
timeout=timeout,
546543
)
547544

548-
@contextmanager
549-
def get_thrift_client(
550-
self, timeout: Optional[float] = None
551-
) -> Generator[EdenService.Sync, None, None]:
552-
with client.create_thrift_client(
553-
eden_dir=str(self._config_dir),
554-
timeout=timeout if timeout is not None else 0,
555-
) as thrift_client:
556-
yield thrift_client
557-
558545
def get_checkout_info(
559546
self, path: Union[Path, str]
560547
) -> "collections.OrderedDict[str, Union[str, bool]]":

0 commit comments

Comments
 (0)