Did some update to storage, need to create new socket for every neew IP and delete when not in use, added timeout values for connection

Author: harshit-soora

osd/storage_gossip.py

@@ -10,84 +10,104 @@
 
 def recovery(node_ip, node_id):
 	#Will call monitor to state about the down node
+	soc = socket.socket()
+	soc.settimeout(3)
+
 	monitor_1 = monitor_ip["primary"]
-	soc.connect(monitor_1["ip"], monitor_1["port"])	
-	print(f"Connecting Primary monitor...")
 
-	res = {"type": "FAIL", "ip" : node_ip, "id" : node_id}
-	_send_msg(soc, res)
-
-	try:
-		msg = _recv_msg(c, 1024)
-		if msg["type"] == "ACK": 
-			return
-		else:
-			pass
-
-	except socket.timeout: # fail after 1 second of no activity
+	try :
+		soc.connect(monitor_1["ip"], monitor_1["port"])	
+		soc.timeout(None)
+
+		print(f"Connecting Primary monitor...")
+		
+		res = {"type": "FAIL", "ip" : node_ip, "id" : node_id}
+		_send_msg(soc, res)
+
+		try:
+			msg = _recv_msg(c, 1024)
+			if msg["type"] == "ACK": 
+				return
+			else:
+				pass
+
+		except soc.timeout: # fail after 1 second of no activity
+			print("Didn't receive data! [Timeout] Primary Monitor is Down")
+
+	except : 
 		print("Didn't receive data! [Timeout] Primary Monitor is Down")
-		pass
 
-	finally:
-		soc.close()
+	soc.close()
 
+	soc = socket.socket()
+	soc.settimeout(3)
 
 	monitor_2 = monitor_ip["backup"]
-	soc.connect(monitor_2["ip"], monitor_2["port"])				
-	print(f"Connecting Backup monitor...")
-	
-	res = {"type": "FAIL", "ip" : node_ip, "id" : node_id}
-	_send_msg(soc, res)
 
-	try:
-		msg = _recv_msg(c, 1024)
-		if msg["type"] == "ACK": 
-			return
-		else:
-			pass
+	try : 
+		soc.connect(monitor_2["ip"], monitor_2["port"])	
+		soc.settimeout(None)			
+		print(f"Connecting Backup monitor...")
+	
+		res = {"type": "FAIL", "ip" : node_ip, "id" : node_id}
+		_send_msg(soc, res)
 
-	except socket.timeout: # fail after 1 second of no activity
-		print("Didn't receive data! [Timeout] Primary Monitor is Down")
-		pass
+		try:
+			msg = _recv_msg(c, 1024)
+			if msg["type"] == "ACK": 
+				return
+			else:
+				pass
 
-	finally:
-		soc.close()
+		except soc.timeout: # fail after 1 second of no activity
+			print("Didn't receive data! [Timeout] Primary Monitor is Down")
 
-	print("MAY GOD HELP US!! WE ARE DOOMED")
+	except:
+		print("MAY GOD HELP US!! WE ARE DOOMED")
+	
+	soc.close()
 
 
 
 def gossip():
-	soc = socket.socket()
-	print ("Socket successfully created for Gossip")
 
 	while True:
-		time.sleep(1)
-		# Wait for 1/2 min to  run this protocol
+		time.sleep(10)
+		# Wait for 10 sec to  run this protocol
 
 		i=0
 		for i in range(4):
 			node_ip =  storage_ip[i+1]["ip"]
 			port = storage_ip[i+1]["port"]
-	
-			soc.connect((node_ip, port))				
-			print(f"Connecting {node_ip} storage node number {i+1}")
-			
-			res = {"type": "ALIVE"}
-			_send_msg(soc, res)
 
-			try:
-				msg = _recv_msg(c, 1024)
-				if msg["type"] != "ALIVE": 
+			soc.settimeout(3)
+			soc = socket.socket()
+			soc.settimeout(None)
+			print ("Socket successfully created for Gossip")
+		
+			try :
+				soc.connect((node_ip, port))
+				soc.timeout(None)
+
+				print(f"Connecting {node_ip} storage node number {i+1}")
+				
+				msg = {"type": "ALIVE"}
+				_send_msg(soc, msg)
+
+				try:
+					rec = _recv_msg(c, 1024)
+					if rec["type"] != "ALIVE": 
+						recovery(node_ip, i+1)
+
+				except socket.timeout: # fail after 1 second of no activity
+					print("Didn't receive data! [Timeout]")
 					recovery(node_ip, i+1)
-
-			except socket.timeout: # fail after 1 second of no activity
+				
+			except :	
 				print("Didn't receive data! [Timeout]")
 				recovery(node_ip, i+1)
-
-			finally:
-				soc.close()
 
+			soc.close()