From b93ef94f4f038ee2cafb409f418ca89a52ebc727 Mon Sep 17 00:00:00 2001 From: Brett Naul Date: Sat, 15 Feb 2020 10:51:24 -0800 Subject: [PATCH 1/2] Check exact equality for worker state --- distributed/scheduler.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distributed/scheduler.py b/distributed/scheduler.py index e6e6adf7ced..40c96e899d0 100644 --- a/distributed/scheduler.py +++ b/distributed/scheduler.py @@ -279,7 +279,10 @@ def __hash__(self): return hash((self.name, self.host)) def __eq__(self, other): - return type(self) == type(other) and hash(self) == hash(other) + return type(self) == type(other) and (self.name, self.host) == ( + other.name, + other.host, + ) @property def host(self): From 3cf2babc52efe9cc8da18bb4a1ad349105db8aa2 Mon Sep 17 00:00:00 2001 From: Brett Naul Date: Sun, 16 Feb 2020 13:59:47 -0800 Subject: [PATCH 2/2] Use address instead of name+host --- distributed/scheduler.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/distributed/scheduler.py b/distributed/scheduler.py index 40c96e899d0..cba399318cc 100644 --- a/distributed/scheduler.py +++ b/distributed/scheduler.py @@ -276,13 +276,10 @@ def __init__( self.extra = extra or {} def __hash__(self): - return hash((self.name, self.host)) + return hash(self.address) def __eq__(self, other): - return type(self) == type(other) and (self.name, self.host) == ( - other.name, - other.host, - ) + return type(self) == type(other) and self.address == other.address @property def host(self):