Changeset 35984

Timestamp:

Aug 20, 2013, 6:17:32 PM (13 years ago)

Author:

watersc1

Message:

I'm going to commit before I start moving everything around so that they're sane.

Location:

trunk/ippm/FilesMonitoring

Files:

• NodeRelated/update_table_undefined.py (modified) (1 diff)
• Supervision/cluster_status.py (modified) (5 diffs)
• Supervision/node_status.py (modified) (3 diffs)
• generate_tables.py (modified) (2 diffs)
• populate_table.py (modified) (2 diffs)
• tools/deneb-locate.py (modified) (1 diff)

trunk/ippm/FilesMonitoring/NodeRelated/update_table_undefined.py

@@ -10 +10 @@
     from ipp.lifetime_templates import Template
 except ImportError:
-    sys.path.append('/home/panstarrs/schastel/local/share/python/')
+    sys.path.append('%s/%s/share/python/' % os.environ['PSCONFDIR'], os.environ['PSCONFIG'])
     sys.stderr.write('ImportError')
     for folder in sys.path:

trunk/ippm/FilesMonitoring/Supervision/cluster_status.py

@@ -9 +9 @@
 toGigs = 1024.**3
 toGigsFromK = 1024.**2
+
+bin_directory = "%s/%s/bin" % (os.environ['PSCONFDIR'], os.environ['PSCONFIG'])
+share_directory = "%s/%s/share/filemon/" % (os.environ['PSCONFDIR'], os.environ['PSCONFIG'])
 
 def usage():
@@ -47 +50 @@
         sql_check = True
     elif argv[1] == 'mhpcc':
-        nodesFilename = '/home/panstarrs/schastel/local/share/ippMhpccStorageNodes'
+        nodesFilename = '%s/ippMhpccStorageNodes' % share_directory
         nodesFile = open(nodesFilename)
         nodes = []
@@ -86 +89 @@
                   "stsci07.0", "stsci07.1", "stsci07.2",
                   "stsci08.0", "stsci08.1", "stsci08.2",
-                  "stsci09.0", "stsci09.1", "stsci09.2", ]
+                  "stsci09.0", "stsci09.1", "stsci09.2",
+                  "stsci10.0", "stsci10.1", "stsci10.2",
+                  "stsci11.0", "stsci11.1", "stsci11.2",
+                  "stsci12.0", "stsci12.1", "stsci12.2",
+                  "stsci13.0", "stsci13.1", "stsci13.2",
+                  "stsci14.0", "stsci14.1", "stsci14.2",
+                  "stsci15.0", "stsci15.1", "stsci15.2",
+                  "stsci16.0", "stsci16.1", "stsci16.2",
+                  "stsci17.0", "stsci17.1", "stsci17.2",
+                  "stsci18.0", "stsci18.1", "stsci18.2",
+                  "stsci19.0", "stsci19.1", "stsci19.2", ]
     elif argv[1] == 'all':
-        nodesFilename = '/home/panstarrs/schastel/local/share/ippMhpccStorageNodes'
+        nodesFilename = '%s/ippMhpccStorageNodes' % share_directory
         nodesFile = open(nodesFilename)
         nodes = []
@@ -106 +119 @@
                         "stsci07.0", "stsci07.1", "stsci07.2",
                         "stsci08.0", "stsci08.1", "stsci08.2",
-                        "stsci09.0", "stsci09.1", "stsci09.2", ])
+                        "stsci09.0", "stsci09.1", "stsci09.2", 
+                        "stsci10.0", "stsci10.1", "stsci10.2",
+                        "stsci11.0", "stsci11.1", "stsci11.2",
+                        "stsci12.0", "stsci12.1", "stsci12.2",
+                        "stsci13.0", "stsci13.1", "stsci13.2",
+                        "stsci14.0", "stsci14.1", "stsci14.2",
+                        "stsci15.0", "stsci15.1", "stsci15.2",
+                        "stsci16.0", "stsci16.1", "stsci16.2",
+                        "stsci17.0", "stsci17.1", "stsci17.2",
+                        "stsci18.0", "stsci18.1", "stsci18.2",
+                        "stsci19.0", "stsci19.1", "stsci19.2", ]
     else:
         nodes = [ ]
@@ -138 +161 @@
 
 def is_update_running(node):
-    p = subprocess.Popen( ['/home/panstarrs/schastel/dev/FilesMonitoring/Supervision/node_status.py', node],
+    p = subprocess.Popen( ['%s/node_status.py' % bin_directory, node],
                           stderr = subprocess.PIPE,
                           stdout = subprocess.PIPE)

trunk/ippm/FilesMonitoring/Supervision/node_status.py

@@ -10 +10 @@
 import datetime
 
+bin_directory = "%s/%s/bin" % (os.environ['PSCONFDIR'], os.environ['PSCONFIG'])
+share_directory = "%s/%s/share/filemon/" % (os.environ['PSCONFDIR'], os.environ['PSCONFIG'])
+node_directory = '/export/%s/ipp_filemon/'
+
 def process_arguments(argv):
     if len(argv) == 1:
@@ -15 +19 @@
         sys.exit(1)
     elif argv[1] == 'all':
-        nodesFilename = '/home/panstarrs/schastel/local/share/ippMhpccStorageNodes'
+        nodesFilename = '%s/ippMhpccStorageNodes' % share_directory
         nodesFile = open(nodesFilename)
         nodes = []
@@ -45 +49 @@
 
 def get_seconds_since_last_message(ssh, node):
-    logfilename = '/export/%s/schastel/logs/%s_refresh.log' % (node, node)
+    logfilename = ('%s/%s' % (node_directory, '/logs/%s_refresh.log') % (node, node))
     stdin, stdout, stderr = ssh.exec_command('tail -n 1 %s' % (logfilename))
     for line in stdout:

trunk/ippm/FilesMonitoring/generate_tables.py

@@ -2 +2 @@
 
 letters = '0123456789abcdef'
+share_directory = "%s/%s/share/filemon/" % (os.environ['PSCONFDIR'], os.environ['PSCONFIG'])
 
 nodes = []
-nodesFile = open('/home/panstarrs/schastel/local/share/ippMhpccStorageNodes')
+nodesFile = open('%s/ippMhpccStorageNodes' % share_directory)
 for line in nodesFile:
     nodes.append(line[:-1])
@@ -10 +11 @@
 
 template = ""
-templateFile = open('sql/CreateTablesTemplate.sql')
+templateFile = open('%s/sql/CreateTablesTemplate.sql' % share_directory)
 for line in templateFile:
     template = "%s%s" % (template, line)

trunk/ippm/FilesMonitoring/populate_table.py

@@ -5 +5 @@
 import os
 
+bin_directory = "%s/%s/bin" % (os.environ['PSCONFDIR'], os.environ['PSCONFIG'])
+share_directory = "%s/%s/share/filemon/" % (os.environ['PSCONFDIR'], os.environ['PSCONFIG'])
+node_directory = '/export/%s.0/ipp_filemon/'
+
 def populate(node, directory):
+    root_dir = "%s/populate" % node_directory
     try:
-        os.makedirs('/export/%s.0/schastel/populate/sql' % node)
+        os.makedirs(('%s/sql' % root_dir) % node)
     except OSError:
         pass
-    output = open('/export/%s.0/schastel/populate/sql/populate_%s_%s.sql' % (node, node, directory),
+    output = open(('%s/%s' % (root_dir, 'sql/populate_%s_%s.sql')) % (node, node, directory),
                   'w')
-    ignored = open('/export/%s.0/schastel/populate/ignored_%s_%s' % (node, node, directory),
+    ignored = open(('%s/%s' % (root_dir, 'log/ignored_%s_%s')) % (node, node, directory),
                    'w')
-    stdout = open('/export/%s.0/schastel/populate/stdout_%s_%s' % (node, node, directory),
+    stdout = open(('%s/%s' % (root_dir, 'log/stdout_%s_%s')) % (node, node, directory),
                   'w')
-    index_filename = '/export/%s.0/schastel/mlocate/%s.%s.mlocate_db' % (node, node, directory)
-    p = subprocess.Popen(('/home/panstarrs/schastel/local/bin/locate -d %s .' 
-                          % index_filename).split(' '),
+    index_filename = ('%s/%s' % (node_directory,'/mlocate/%s.%s.mlocate_db')) % (node, node, directory)
+    p = subprocess.Popen(('%s/locate -d %s .' 
+                          % bin_directory,index_filename).split(' '),
                          stdout = subprocess.PIPE)
     p.poll()
@@ -41 +46 @@
 letters = '0123456789abcdef'
 insertTemplate=""
-sqlFile = open('/home/panstarrs/schastel/dev/FilesMonitoring/sql/insert_template.sql')
+sqlFile = open('%s/sql/insert_template.sql' % share_directory)
 for line in sqlFile:
     insertTemplate = "%s%s" % (insertTemplate, line)

trunk/ippm/FilesMonitoring/tools/deneb-locate.py

@@ -72 +72 @@
               ("stsci08", "0"), ("stsci08", "1"), ("stsci08", "2"),
               ("stsci09", "0"), ("stsci09", "1"), ("stsci09", "2"), 
+              ("stsci10", "0"), ("stsci10", "1"), ("stsci10", "2"),
+              ("stsci11", "0"), ("stsci11", "1"), ("stsci11", "2"),
+              ("stsci12", "0"), ("stsci12", "1"), ("stsci12", "2"),
+              ("stsci13", "0"), ("stsci13", "1"), ("stsci13", "2"),
+              ("stsci14", "0"), ("stsci14", "1"), ("stsci14", "2"),
+              ("stsci15", "0"), ("stsci15", "1"), ("stsci15", "2"),
+              ("stsci16", "0"), ("stsci16", "1"), ("stsci16", "2"),
+              ("stsci17", "0"), ("stsci17", "1"), ("stsci17", "2"),
+              ("stsci18", "0"), ("stsci18", "1"), ("stsci18", "2"),
+              ("stsci19", "0"), ("stsci19", "1"), ("stsci19", "2"), 
               ]