partial cleanup of Peer.py
This commit is contained in:
Matthew Bell
parent
b6cb1062ce
commit
3f14d3d200
342
src/Peer/Peer.py
342
src/Peer/Peer.py
|
|
@ -5,207 +5,195 @@ from Debug import Debug
|
||||||
|
|
||||||
# Communicate remote peers
|
# Communicate remote peers
|
||||||
class Peer(object):
|
class Peer(object):
|
||||||
__slots__ = ("ip", "port", "site", "key", "connection_server", "connection", "last_found", "last_response", "last_ping", "added", "connection_error", "hash_failed", "download_bytes", "download_time")
|
__slots__ = ("ip", "port", "site", "key", "connection_server", "connection", "last_found", "last_response", "last_ping", "added", "connection_error", "hash_failed", "download_bytes", "download_time")
|
||||||
|
|
||||||
def __init__(self, ip, port, site=None):
|
def __init__(self, ip, port, site=None):
|
||||||
self.ip = ip
|
self.ip = ip
|
||||||
self.port = port
|
self.port = port
|
||||||
self.site = site
|
self.site = site
|
||||||
self.key = "%s:%s" % (ip, port)
|
self.key = "%s:%s" % (ip, port)
|
||||||
self.connection_server = sys.modules["main"].file_server
|
self.connection_server = sys.modules["main"].file_server
|
||||||
|
|
||||||
self.connection = None
|
self.connection = None
|
||||||
self.last_found = None # Time of last found in the torrent tracker
|
self.last_found = None # Time of last found in the torrent tracker
|
||||||
self.last_response = None # Time of last successfull response from peer
|
self.last_response = None # Time of last successfull response from peer
|
||||||
self.last_ping = None # Last response time for ping
|
self.last_ping = None # Last response time for ping
|
||||||
self.added = time.time()
|
self.added = time.time()
|
||||||
|
|
||||||
self.connection_error = 0 # Series of connection error
|
self.connection_error = 0 # Series of connection error
|
||||||
self.hash_failed = 0 # Number of bad files from peer
|
self.hash_failed = 0 # Number of bad files from peer
|
||||||
self.download_bytes = 0 # Bytes downloaded
|
self.download_bytes = 0 # Bytes downloaded
|
||||||
self.download_time = 0 # Time spent to download
|
self.download_time = 0 # Time spent to download
|
||||||
|
|
||||||
|
def log(self, text):
|
||||||
|
if self.site:
|
||||||
|
self.site.log.debug("%s:%s %s" % (self.ip, self.port, text))
|
||||||
|
else:
|
||||||
|
logging.debug("%s:%s %s" % (self.ip, self.port, text))
|
||||||
|
|
||||||
def log(self, text):
|
# Connect to host
|
||||||
if self.site:
|
def connect(self, connection=None):
|
||||||
self.site.log.debug("%s:%s %s" % (self.ip, self.port, text))
|
if self.connection:
|
||||||
else:
|
self.log("Getting connection (Closing %s)..." % self.connection)
|
||||||
logging.debug("%s:%s %s" % (self.ip, self.port, text))
|
self.connection.close()
|
||||||
|
else:
|
||||||
|
self.log("Getting connection...")
|
||||||
|
|
||||||
|
if connection: # Connection specified
|
||||||
|
self.connection = connection
|
||||||
|
else: # Try to find from connection pool or create new connection
|
||||||
|
self.connection = None
|
||||||
|
|
||||||
# Connect to host
|
try:
|
||||||
def connect(self, connection = None):
|
self.connection = self.connection_server.getConnection(self.ip, self.port)
|
||||||
if self.connection:
|
except Exception, err:
|
||||||
self.log("Getting connection (Closing %s)..." % self.connection)
|
self.onConnectionError()
|
||||||
self.connection.close()
|
self.log("Getting connection error: %s (connection_error: %s, hash_failed: %s)" % (Debug.formatException(err), self.connection_error, self.hash_failed))
|
||||||
else:
|
self.connection = None
|
||||||
self.log("Getting connection...")
|
|
||||||
|
|
||||||
if connection: # Connection specificed
|
|
||||||
self.connection = connection
|
|
||||||
else: # Try to find from connection pool or create new connection
|
|
||||||
self.connection = None
|
|
||||||
|
|
||||||
try:
|
# Check if we have connection to peer
|
||||||
self.connection = self.connection_server.getConnection(self.ip, self.port)
|
def findConnection(self):
|
||||||
except Exception, err:
|
if self.connection and self.connection.connected: # We have connection to peer
|
||||||
self.onConnectionError()
|
return self.connection
|
||||||
self.log("Getting connection error: %s (connection_error: %s, hash_failed: %s)" % (Debug.formatException(err), self.connection_error, self.hash_failed))
|
else: # Try to find from other sites connections
|
||||||
self.connection = None
|
self.connection = self.connection_server.getConnection(self.ip, self.port, create=False) # Do not create new connection if not found
|
||||||
|
return self.connection
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return "Peer %-12s" % self.ip
|
||||||
|
|
||||||
# Check if we have connection to peer
|
def __repr__(self):
|
||||||
def findConnection(self):
|
return "<%s>" % self.__str__()
|
||||||
if self.connection and self.connection.connected: # We have connection to peer
|
|
||||||
return self.connection
|
|
||||||
else: # Try to find from other sites connections
|
|
||||||
self.connection = self.connection_server.getConnection(self.ip, self.port, create=False) # Do not create new connection if not found
|
|
||||||
return self.connection
|
|
||||||
|
|
||||||
|
# Peer ip:port to packed 6byte format
|
||||||
def __str__(self):
|
def packAddress(self):
|
||||||
return "Peer %-12s" % self.ip
|
return socket.inet_aton(self.ip)+struct.pack("H", self.port)
|
||||||
|
|
||||||
def __repr__(self):
|
def unpackAddress(self, packed):
|
||||||
return "<%s>" % self.__str__()
|
return socket.inet_ntoa(packed[0:4]), struct.unpack_from("H", packed, 4)[0]
|
||||||
|
|
||||||
|
# Found a peer on tracker
|
||||||
|
def found(self):
|
||||||
|
self.last_found = time.time()
|
||||||
|
|
||||||
# Peer ip:port to packed 6byte format
|
# Send a command to peer
|
||||||
def packAddress(self):
|
def request(self, cmd, params = {}):
|
||||||
return socket.inet_aton(self.ip)+struct.pack("H", self.port)
|
if not self.connection or self.connection.closed:
|
||||||
|
self.connect()
|
||||||
|
if not self.connection:
|
||||||
|
self.onConnectionError()
|
||||||
|
return None # Connection failed
|
||||||
|
|
||||||
|
#if cmd != "ping" and self.last_response and time.time() - self.last_response > 20*60: # If last response if older than 20 minute, ping first to see if still alive
|
||||||
|
# if not self.ping(): return None
|
||||||
|
|
||||||
def unpackAddress(self, packed):
|
for retry in range(1,3): # Retry 3 times
|
||||||
return (socket.inet_ntoa(packed[0:4]), struct.unpack_from("H", packed, 4)[0])
|
#if config.debug_socket: self.log.debug("sendCmd: %s %s" % (cmd, params.get("inner_path")))
|
||||||
|
try:
|
||||||
|
response = self.connection.request(cmd, params)
|
||||||
|
if not response:
|
||||||
|
raise Exception("Send error")
|
||||||
|
#if config.debug_socket: self.log.debug("Got response to: %s" % cmd)
|
||||||
|
if "error" in response:
|
||||||
|
self.log("%s error: %s" % (cmd, response["error"]))
|
||||||
|
self.onConnectionError()
|
||||||
|
else: # Successful request, reset connection error num
|
||||||
|
self.connection_error = 0
|
||||||
|
self.last_response = time.time()
|
||||||
|
return response
|
||||||
|
except Exception, err:
|
||||||
|
if type(err).__name__ == "Notify": # Greenlet kill by worker
|
||||||
|
self.log("Peer worker got killed: %s, aborting cmd: %s" % (err.message, cmd))
|
||||||
|
break
|
||||||
|
else:
|
||||||
|
self.onConnectionError()
|
||||||
|
self.log("%s (connection_error: %s, hash_failed: %s, retry: %s)" % (Debug.formatException(err), self.connection_error, self.hash_failed, retry))
|
||||||
|
time.sleep(1*retry)
|
||||||
|
self.connect()
|
||||||
|
return None # Failed after 4 retry
|
||||||
|
|
||||||
|
# Get a file content from peer
|
||||||
|
def getFile(self, site, inner_path):
|
||||||
|
location = 0
|
||||||
|
buff = StringIO()
|
||||||
|
s = time.time()
|
||||||
|
while 1: # Read in 512k parts
|
||||||
|
back = self.request("getFile", {"site": site, "inner_path": inner_path, "location": location}) # Get file content from last location
|
||||||
|
if not back or "body" not in back: # Error
|
||||||
|
return False
|
||||||
|
|
||||||
# Found a peer on tracker
|
buff.write(back["body"])
|
||||||
def found(self):
|
back["body"] = None # Save memory
|
||||||
self.last_found = time.time()
|
if back["location"] == back["size"]: # End of file
|
||||||
|
break
|
||||||
|
else:
|
||||||
|
location = back["location"]
|
||||||
|
self.download_bytes += back["location"]
|
||||||
|
self.download_time += (time.time() - s)
|
||||||
|
buff.seek(0)
|
||||||
|
return buff
|
||||||
|
|
||||||
|
# Send a ping request
|
||||||
|
def ping(self):
|
||||||
|
response_time = None
|
||||||
|
for retry in range(1,3): # Retry 3 times
|
||||||
|
s = time.time()
|
||||||
|
with gevent.Timeout(10.0, False): # 10 sec timeout, dont raise exception
|
||||||
|
response = self.request("ping")
|
||||||
|
|
||||||
# Send a command to peer
|
if response and "body" in response and response["body"] == "Pong!":
|
||||||
def request(self, cmd, params = {}):
|
response_time = time.time()-s
|
||||||
if not self.connection or self.connection.closed:
|
break # All fine, exit from for loop
|
||||||
self.connect()
|
# Timeout reached or bad response
|
||||||
if not self.connection:
|
self.onConnectionError()
|
||||||
self.onConnectionError()
|
self.connect()
|
||||||
return None # Connection failed
|
time.sleep(1)
|
||||||
|
|
||||||
#if cmd != "ping" and self.last_response and time.time() - self.last_response > 20*60: # If last response if older than 20 minute, ping first to see if still alive
|
if response_time:
|
||||||
# if not self.ping(): return None
|
self.log("Ping: %.3f" % response_time)
|
||||||
|
else:
|
||||||
|
self.log("Ping failed")
|
||||||
|
self.last_ping = response_time
|
||||||
|
return response_time
|
||||||
|
|
||||||
for retry in range(1,3): # Retry 3 times
|
# Request peer exchange from peer
|
||||||
#if config.debug_socket: self.log.debug("sendCmd: %s %s" % (cmd, params.get("inner_path")))
|
def pex(self, site=None, need_num=5):
|
||||||
try:
|
if not site:
|
||||||
response = self.connection.request(cmd, params)
|
site = self.site # If no site defined request peers for this site
|
||||||
if not response: raise Exception("Send error")
|
# give him/her 5 connectable peers
|
||||||
#if config.debug_socket: self.log.debug("Got response to: %s" % cmd)
|
packed_peers = [peer.packAddress() for peer in self.site.getConnectablePeers(5)]
|
||||||
if "error" in response:
|
response = self.request("pex", {"site": site.address, "peers": packed_peers, "need": need_num})
|
||||||
self.log("%s error: %s" % (cmd, response["error"]))
|
if not response or "error" in response:
|
||||||
self.onConnectionError()
|
return False
|
||||||
else: # Successful request, reset connection error num
|
added = 0
|
||||||
self.connection_error = 0
|
for peer in response.get("peers", []):
|
||||||
self.last_response = time.time()
|
address = self.unpackAddress(peer)
|
||||||
return response
|
if site.addPeer(*address):
|
||||||
except Exception, err:
|
added += 1
|
||||||
if type(err).__name__ == "Notify": # Greenlet kill by worker
|
if added:
|
||||||
self.log("Peer worker got killed: %s, aborting cmd: %s" % (err.message, cmd))
|
self.log("Added peers using pex: %s" % added)
|
||||||
break
|
return added
|
||||||
else:
|
|
||||||
self.onConnectionError()
|
|
||||||
self.log("%s (connection_error: %s, hash_failed: %s, retry: %s)" % (Debug.formatException(err), self.connection_error, self.hash_failed, retry))
|
|
||||||
time.sleep(1*retry)
|
|
||||||
self.connect()
|
|
||||||
return None # Failed after 4 retry
|
|
||||||
|
|
||||||
|
# List modified files since the date
|
||||||
|
# Return: {inner_path: modification date,...}
|
||||||
|
def listModified(self, since):
|
||||||
|
return self.request("listModified", {"since": since, "site": self.site.address})
|
||||||
|
|
||||||
# Get a file content from peer
|
# Stop and remove from site
|
||||||
def getFile(self, site, inner_path):
|
def remove(self):
|
||||||
location = 0
|
self.log("Removing peer...Connection error: %s, Hash failed: %s" % (self.connection_error, self.hash_failed))
|
||||||
buff = StringIO()
|
if self.key in self.site.peers: del(self.site.peers[self.key])
|
||||||
s = time.time()
|
if self.connection:
|
||||||
while 1: # Read in 512k parts
|
self.connection.close()
|
||||||
back = self.request("getFile", {"site": site, "inner_path": inner_path, "location": location}) # Get file content from last location
|
|
||||||
if not back or "body" not in back: # Error
|
|
||||||
return False
|
|
||||||
|
|
||||||
buff.write(back["body"])
|
# - EVENTS -
|
||||||
back["body"] = None # Save memory
|
|
||||||
if back["location"] == back["size"]: # End of file
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
location = back["location"]
|
|
||||||
self.download_bytes += back["location"]
|
|
||||||
self.download_time += (time.time() - s)
|
|
||||||
buff.seek(0)
|
|
||||||
return buff
|
|
||||||
|
|
||||||
|
# On connection error
|
||||||
|
def onConnectionError(self):
|
||||||
|
self.connection_error += 1
|
||||||
|
if self.connection_error >= 3: # Dead peer
|
||||||
|
self.remove()
|
||||||
|
|
||||||
# Send a ping request
|
# Done working with peer
|
||||||
def ping(self):
|
def onWorkerDone(self):
|
||||||
response_time = None
|
pass
|
||||||
for retry in range(1,3): # Retry 3 times
|
|
||||||
s = time.time()
|
|
||||||
with gevent.Timeout(10.0, False): # 10 sec timeout, dont raise exception
|
|
||||||
response = self.request("ping")
|
|
||||||
|
|
||||||
if response and "body" in response and response["body"] == "Pong!":
|
|
||||||
response_time = time.time()-s
|
|
||||||
break # All fine, exit from for loop
|
|
||||||
# Timeout reached or bad response
|
|
||||||
self.onConnectionError()
|
|
||||||
self.connect()
|
|
||||||
time.sleep(1)
|
|
||||||
|
|
||||||
if response_time:
|
|
||||||
self.log("Ping: %.3f" % response_time)
|
|
||||||
else:
|
|
||||||
self.log("Ping failed")
|
|
||||||
self.last_ping = response_time
|
|
||||||
return response_time
|
|
||||||
|
|
||||||
|
|
||||||
# Request peer exchange from peer
|
|
||||||
def pex(self, site=None, need_num=5):
|
|
||||||
if not site: site = self.site # If no site definied request peers for this site
|
|
||||||
packed_peers = [peer.packAddress() for peer in self.site.getConnectablePeers(5)] # give him/her 5 connectable peers
|
|
||||||
response = self.request("pex", {"site": site.address, "peers": packed_peers, "need": need_num})
|
|
||||||
if not response or "error" in response:
|
|
||||||
return False
|
|
||||||
added = 0
|
|
||||||
for peer in response.get("peers", []):
|
|
||||||
address = self.unpackAddress(peer)
|
|
||||||
if (site.addPeer(*address)): added += 1
|
|
||||||
if added:
|
|
||||||
self.log("Added peers using pex: %s" % added)
|
|
||||||
return added
|
|
||||||
|
|
||||||
|
|
||||||
# List modified files since the date
|
|
||||||
# Return: {inner_path: modification date,...}
|
|
||||||
def listModified(self, since):
|
|
||||||
response = self.request("listModified", {"since": since, "site": self.site.address})
|
|
||||||
return response
|
|
||||||
|
|
||||||
|
|
||||||
# Stop and remove from site
|
|
||||||
def remove(self):
|
|
||||||
self.log("Removing peer...Connection error: %s, Hash failed: %s" % (self.connection_error, self.hash_failed))
|
|
||||||
if self.key in self.site.peers: del(self.site.peers[self.key])
|
|
||||||
if self.connection:
|
|
||||||
self.connection.close()
|
|
||||||
|
|
||||||
|
|
||||||
# - EVENTS -
|
|
||||||
|
|
||||||
# On connection error
|
|
||||||
def onConnectionError(self):
|
|
||||||
self.connection_error += 1
|
|
||||||
if self.connection_error >= 3: # Dead peer
|
|
||||||
self.remove()
|
|
||||||
|
|
||||||
|
|
||||||
# Done working with peer
|
|
||||||
def onWorkerDone(self):
|
|
||||||
pass
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue