Changeset 39662 for branches/czw_branch/20160809/Nebulous

Timestamp:

Aug 30, 2016, 1:38:49 PM (10 years ago)

Author:

watersc1

Message:

Commit of test version of Nebulous location based code.

Location:

branches/czw_branch/20160809/Nebulous

Files:

• lib/Nebulous/Client.pm (modified) (2 diffs)
• nebclient/src/nebclient.c (modified) (1 diff)

branches/czw_branch/20160809/Nebulous/lib/Nebulous/Client.pm

@@ -18 +18 @@
 use Params::Validate qw( validate validate_pos SCALAR UNDEF BOOLEAN );
 #use SOAP::Lite +trace => [qw( debug )];
+use Sys::Hostname;
 use SOAP::Lite;
 use Time::HiRes qw( sleep );
@@ -980 +981 @@
     $log->debug( "entered - @_" );
 
+    my $find_volume = hostname() . ".0";
+    $params[0] = $find_volume;
     my $locations = $self->find_instances( $key, @params );
     unless (defined $locations) {

branches/czw_branch/20160809/Nebulous/nebclient/src/nebclient.c

@@ -529 +529 @@
         return NULL;
     }
+
+    // Construct a dummy volume name to allow nebulous to find the
+    // closest instance available.
+    char hostname[256];
+    char volname[260];
+
+    if (!gethostname(hostname,256)) {
+      nebSetErr(server, "failed to construct hostname");
+      return NULL;
+    }
+    snprintf(volname,260, "%s.0", hostname);
     
-    nebObjectInstances *locations = nebFindInstances(server, key, NULL);
+    nebObjectInstances *locations = nebFindInstances(server, key, volname);
     if (!locations) {
         if (!strstr(nebErr(server), "no instances on storage volume")) {