diff -pruN /home/harsha/gluster-work/current-rc3/gluster--mainline--1.0--patch-93/extensions/GlusterHPC/GlusterHPC GlusterHPC/GlusterHPC --- /home/harsha/gluster-work/current-rc3/gluster--mainline--1.0--patch-93/extensions/GlusterHPC/GlusterHPC 2006-08-04 12:39:07.000000000 -0700 +++ GlusterHPC/GlusterHPC 2006-08-11 18:05:19.000000000 -0700 @@ -79,7 +79,7 @@ def get_slaves (node): return def source_config (node): - if os.system ("ssh -t %s 'gprobe | gpart-sel -o /tmp/ghpc.spec -c /tmp/ghpc_tar_cmds -m /tmp/ghpc_approx_max' 2>>/var/log/proglog" % node) != 0: + if os.system ("ssh -t %s 'gprobe | gpart-sel -o /tmp/ghpc.xml -c /tmp/ghpc_tar_cmds -m /tmp/ghpc_approx_max' 2>>/var/log/proglog" % node) != 0: return 1 else: return 0 @@ -97,10 +97,12 @@ def make_slaves (slave_list): def source_action (node): - partlist = gdump_partlist (read_gdump (os.popen ("ssh %s 'cat /tmp/ghpc.spec' 2>>/var/log/proglog" % node))) + partlist = gdump_partlist (read_xml_to_gdump (os.popen ("ssh %s 'cat /tmp/ghpc.xml' 2>>/var/log/proglog" % node))) parts = partlist.keys () parts = filter ((lambda x: - partlist[x]['FS'] != 'linux-swap' and partlist[x]['XFER'] == 'Y'), + partlist[x]['FS'] != 'linux-swap' \ + and partlist[x].has_key ('XFER') \ + and partlist[x]['XFER'] == 'Y'), parts) no_parts = len (parts) min_clients = os.popen ('gping -p 1332 -i /tmp/session_hosts | grep slave | wc -l').readline ().strip () @@ -120,10 +122,12 @@ def dest_config (node): # Send all the gex packages to clients os.system ("ghpc_send >>/var/log/proglog 2>&1") - partlist = gdump_partlist (read_gdump (os.popen ('ssh %s cat /tmp/ghpc.spec 2>>/var/log/proglog' % node))) + partlist = gdump_partlist (read_xml_to_gdump (os.popen ('ssh %s cat /tmp/ghpc.xml 2>>/var/log/proglog' % node))) parts = partlist.keys () parts = filter ((lambda x: - partlist[x]['FS'] != 'linux-swap' and partlist[x]['XFER'] == 'Y'), + partlist[x]['FS'] != 'linux-swap' \ + and partlist[x]['XFER'] \ + and partlist[x]['XFER'] == 'Y'), parts) no_parts = len (parts) cmd_file = os.popen ('ssh %s dd of=/tmp/ghpc_dest_cmds 2>>/var/log/proglog' % node, "w") @@ -137,7 +141,7 @@ def dest_config (node): def hpc_action (node): # TODO: Give a hook to user inbetween - os.system ("ssh %s 'gmeta-installer --auto --input /tmp/ghpc.spec -c /tmp/ghpc_dest_cmds' >>/var/log/proglog 2>&1" % node) + os.system ("ssh %s 'gmeta-installer --auto --input /tmp/ghpc.xml -c /tmp/ghpc_dest_cmds' >>/var/log/proglog 2>&1" % node) if get_hostname ('1') != node: os.system ("rm -rf /tmp/gmi") os.system ("scp -r %s:/tmp/gmi /tmp" % node) @@ -204,7 +208,7 @@ def get_dst_nodes (dst_nodes): if len (x) == 1: fd.write ("%s%s\n" % (get_hostname (), x[0])) elif len (x) == 2: - if int (x[0]) < int (x[1]): + if x[0] < x[1]: for a in range (int (x[0]), int (x[1]) + 1): fd.write ("%s%s\n" % (get_hostname (), a)) else: