Bug fixed in vmware-discover-servers.py. Added timestamp to check recent response.

2 files changed, 10 insertions, 2 deletions

diff --git a/src/com.gluster.storage.management.server.scripts/src/multicast_response.py b/src/com.gluster.storage.management.server.scripts/src/multicast_response.py
index baa3f830..3d8125d8 100644
--- a/src/com.gluster.storage.management.server.scripts/src/multicast_response.py
+++ b/src/com.gluster.storage.management.server.scripts/src/multicast_response.py
@@ -52,7 +52,8 @@ def response(multiCastGroup, port):
             if isinpeer():

                 time.sleep(5)

                 continue

-            socketSend.sendto(socket.gethostname(), (multiCastGroup, port))

+            socketSend.sendto("<response><servername>%s</servername><time>%s</time></response>" % (socket.gethostname(), time.time()), 

+                              (multiCastGroup, port))

             request = None

 

 def main():

diff --git a/src/com.gluster.storage.management.server/WebContent/scripts/vmware-discover-servers.py b/src/com.gluster.storage.management.server/WebContent/scripts/vmware-discover-servers.py
index 6ac15fed..80e6101c 100755
--- a/src/com.gluster.storage.management.server/WebContent/scripts/vmware-discover-servers.py
+++ b/src/com.gluster.storage.management.server/WebContent/scripts/vmware-discover-servers.py
@@ -23,6 +23,8 @@ import struct
 import syslog
 import Globals
 import Common
+import time
+from XmlHandler import *
 
 class TimeoutException(Exception):
     pass
@@ -50,7 +52,12 @@ def serverDiscoveryRequest(multiCastGroup, port):
         while True:
             response = socketReceive.recvfrom(200)
             if response and response[0].upper() != "SERVERDISCOVERY":
-                servers.append(response[0])
+                dom = XDOM()
+                dom.parseString(response[0])
+                responsetime = dom.getTextByTagRoute("response.time")
+                servername = dom.getTextByTagRoute("response.servername")
+                if time.time() - float(responsetime) < 60:
+                    servers.append(servername)
             signal.signal(signal.SIGALRM, timeoutSignal)
             signal.alarm(3)
     except TimeoutException: