Changeset 26994 for gs2-extensions/tdb-edit

Timestamp:

2013-03-05T10:36:41+13:00 (11 years ago)

Author:

jmt12

Message:

Adding some more debug messages to ensure TDBServer is starting on the correct host. Eventually found I had localhost hardcoded in the TDBServer.pl launcher and that isn't the write interface for compute nodes to see it (needs to be on medusa.local)

File:

• gs2-extensions/tdb-edit/trunk/src/perllib/dbutil/tdbserver.pm (modified) (5 diffs)

gs2-extensions/tdb-edit/trunk/src/perllib/dbutil/tdbserver.pm

@@ -68 +68 @@
 
   my $server_lockfile_path =  &util::filename_cat($ENV{'GSDLHOME'},'collect',$collection,'tmp','tdbserver.lock');
-  #rint " * Searching for lockfile: " . $server_lockfile_path . "\n";
+  print " * Searching for TDBServer lockfile...\n";
   if (!-e $server_lockfile_path)
   {
+    print "Not found.\n";
     # We need to lock here to ensure only one thread enters the following code,
     # sees a missing TDBServer, and launches it
@@ -82 +83 @@
       # ...start it!
       my $launch_cmd = 'TDBServer.pl "' . $$ . '" "' . $collection . '"';
-      print "* Starting TDBServer for: " . $collection . " [" . $launch_cmd . "]\n";
+      print "* Starting TDBServer for: " . $collection . " [" . $launch_cmd . "]... ";
       # @note I once had the below pipe ending with 2>&1 |, but that then blocks
       #       indefinitely when looping and reading <SERVERIN>.
@@ -89 +90 @@
       my $line = '';
       my $server_lock_file_created = 0;
+      my $server_host = '';
+      my $server_port = '';
       while ($line = <SERVERIN>)
       {
         # - watch for the line indicating a lock file has been created and
         #   populated with a sexy port number
-        if ($line =~ /Server now listening/)
+        if ($line =~ /Server now listening on ([^:]+):(\d+)/)
         {
+          $server_host = $1;
+          $server_port = $2;
           $server_lock_file_created = 1;
         }
@@ -114 +119 @@
         die("Error! TDBServer failed to create lock file. Check server logs.");
       }
+      else
+      {
+        print "Running on " . $server_host . ":" . $server_port . "\n";
+      }
       # record this for later
       $created_server_lockfile_paths{$server_lockfile_path} = 1;
@@ -120 +129 @@
     close($tmp_lockfile_path);
     unlink($tmp_lockfile_path);
+  }
+  else
+  {
+    print "Found!\n";
   }
   # record this for later