Commit 0c769e96 authored by Jim Fulton's avatar Jim Fulton

Time out waiting for protocol handshake. Otherwise, we sometmes see

hangs under extreme conditions.
parent 7ef3b6c9
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
############################################################################## ##############################################################################
"""RPC stubs for interface exported by StorageServer.""" """RPC stubs for interface exported by StorageServer."""
import os
import time import time
## ##
...@@ -368,11 +369,12 @@ class StorageServer308(StorageServer): ...@@ -368,11 +369,12 @@ class StorageServer308(StorageServer):
def iterator_gc(self, iids): def iterator_gc(self, iids):
raise NotImplementedError raise NotImplementedError
def stub(client, connection): def stub(client, connection):
start = time.time()
# Wait until we know what version the other side is using. # Wait until we know what version the other side is using.
while connection.peer_protocol_version is None: while connection.peer_protocol_version is None:
if time.time()-start > 10:
raise ValueError("Timeout waiting for protocol handshake")
time.sleep(0.1) time.sleep(0.1)
if connection.peer_protocol_version < 'Z309': if connection.peer_protocol_version < 'Z309':
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment