Changeset 29482

Timestamp:

Oct 18, 2010, 5:43:59 PM (16 years ago)

Author:

watersc1

Message:

we can take data from hosts that do not have the allocate bit.

File:

• trunk/Nebulous-Server/bin/neb-admin (modified) (5 diffs)

trunk/Nebulous-Server/bin/neb-admin

@@ -229 +229 @@
 
     # use a different exit status if we hit the limit (likely more files pending)
-    if ($Npending == $limit) {
-        exit 1;
-    } 
-    exit 0;
+    # This is a better way to do this.
+    if ($Npending == 0) {
+        exit 0;
+    }
+    else {
+        exit 1;
+    }
+
+#     if ($Npending == $limit) {
+#         exit 1;
+#     } 
+#     exit 0;
 }
 
@@ -297 +305 @@
              cab_id FROM
       mountedvol JOIN volume USING(vol_id)
-      WHERE mountedvol.available = 1 AND mountedvol.allocate = 1
+      WHERE mountedvol.available = 1
       ORDER BY R DESC LIMIT $balance_N_sources                                            -- N
       ) AS ranked_sources
@@ -306 +314 @@
     AND so_id >= $so_id_start                                  -- so_id_start
     AND so_id <  $so_id_end                                    -- so_id_end
-    LIMIT $limit                                               -- limit
    ) AS V -- volumes that host a copy
    -- X End
@@ -336 +343 @@
 -- U End
 GROUP BY so_id
+    LIMIT $limit                                               -- limit
+
 "    );
 
@@ -417 +426 @@
 
     # use a different exit status if we hit the limit (likely more files pending)
-    if ($Npending == $limit) {
-        exit 1;
-    } 
-    exit 0;
+    print STDERR "Which exit: $Npending $limit\n";
+    # This is a better way to do this.
+    if ($Npending == 0) {
+        exit 0;
+    }
+    else {
+        exit 1;
+    }
+
+#     if ($Npending == $limit) {
+#         exit 1;
+#     } 
+#     exit 0;
 }