Set "reserved_space=1G" in newly-created storage nodes. Closes #1208.

diff --git a/docs/configuration.rst b/docs/configuration.rst
index e350c8a41aa619939712bdfc772e38e14753ac89..73ae3a2482fbf389a23a1ebcc22cdd8fd109639c 100644 (file)
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -359,6 +359,10 @@ Storage Server Configuration
     same thing. Likewise, "1MiB", "1024KiB", and "1048576B" all mean the same
     thing.
 
+    "``tahoe create-node``" generates a tahoe.cfg with
+    "``reserved_space=1G``", but you may wish to raise, lower, or remove the
+    reservation to suit your needs.
+
 ``expire.enabled =``
 
 ``expire.mode =``

diff --git a/src/allmydata/scripts/create_node.py b/src/allmydata/scripts/create_node.py
index 928add11bb1f93d41de3b5070cb67357a4fdd8f3..26891b91f1d58d74312787a5d97d6083e432b487 100644 (file)
--- a/src/allmydata/scripts/create_node.py
+++ b/src/allmydata/scripts/create_node.py
@@ -126,7 +126,7 @@ def create_node(config, out=sys.stdout, err=sys.stderr):
     storage_enabled = not config.get("no-storage", None)
     c.write("enabled = %s\n" % boolstr[storage_enabled])
     c.write("#readonly =\n")
-    c.write("#reserved_space =\n")
+    c.write("reserved_space = 1G\n")
     c.write("#expire.enabled =\n")
     c.write("#expire.mode =\n")
     c.write("\n")

diff --git a/src/allmydata/test/test_runner.py b/src/allmydata/test/test_runner.py
index b8e9b8a6cf69cfca1eb04de9eb713b64e8a3acfa..b8aa298d2a7ccd0bfb75026956f5d5e45f0a76eb 100644 (file)
--- a/src/allmydata/test/test_runner.py
+++ b/src/allmydata/test/test_runner.py
@@ -213,6 +213,7 @@ class CreateNode(unittest.TestCase):
                 self.failUnless("\n[storage]\nenabled = false\n" in content)
             else:
                 self.failUnless("\n[storage]\nenabled = true\n" in content)
+                self.failUnless("\nreserved_space = 1G\n" in content)
 
         # creating the node a second time should be rejected
         rc, out, err = self.run_tahoe(argv)