Changeset 31434 for branches/czw_branch/20110406/Nebulous-Server/lib/Nebulous/Server/SQL.pm

Timestamp:

May 4, 2011, 3:20:38 PM (15 years ago)

Author:

watersc1

Message:

Merging trunk into this branch

Location:

branches/czw_branch/20110406

Files:

• . (modified) (1 prop)
• Nebulous-Server/lib/Nebulous/Server/SQL.pm (modified) (3 diffs)

branches/czw_branch/20110406/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