Changeset 31439 for branches/eam_branches/ipp-20110404/Nebulous-Server

Timestamp:

May 5, 2011, 10:05:10 AM (15 years ago)

Author:

eugene

Message:

merging updates from trunk

Location:

branches/eam_branches/ipp-20110404/Nebulous-Server/lib/Nebulous

Files:

• Server.pm (modified) (1 diff)
• Server/SQL.pm (modified) (3 diffs)

branches/eam_branches/ipp-20110404/Nebulous-Server/lib/Nebulous/Server.pm

@@ -2546 +2546 @@
     }
 
-    if ($xattr) {
-        my $path = $uri->file;
-        $log->logdie("can not set xattr on $path: $!")
-            unless (setfattr($path, 'user.nebulous_key', $key->path));
-    }
+#     if ($xattr) {
+#         my $path = $uri->file;
+#         $log->logdie("can not set xattr on $path: $!")
+#             unless (setfattr($path, 'user.nebulous_key', $key->path));
+#     }
 
     return $uri;

branches/eam_branches/ipp-20110404/Nebulous-Server/lib/Nebulous/Server/SQL.pm

@@ -336 +336 @@
              AND m.available = ?
              AND m.allocate = ?
+             AND m.xattr = 0
              AND ( (v.cab_id IS NULL) ||
                    (v.cab_id != ?) )
@@ -344 +345 @@
     },
     # volume handler
+    # This has a hack to get around the lack of location awareness by using xattr.
     get_storage_volume          => qq{
         SELECT * from (
@@ -357 +359 @@
             AND available = ?
             AND allocate = ?
+            AND xattr = 0
         ORDER BY free DESC
         LIMIT ?) as topfew