Merge branch 'no-working-flag' into fuse_ll

3 files changed, 43 insertions, 9 deletions

diff --git a/conf/README.server b/conf/README.server
index 285758b..08be09f 100644
--- a/conf/README.server
+++ b/conf/README.server
@@ -7,13 +7,18 @@ There are two files in that dir
 
 == alt-servers ==
 List of known alt-servers for this server.
-Format:
-[PREFIX]<IP:PORT> [Comment]
-
-Prefix can be:
-+ - Only report server to clients as alt-server, but don't use for replication
-- - Only use server for replication, but don't advertise to clients
-No prefix means server will be advertised to clients and is used for replication
+INI Format:
+[Address]
+comment=Whatever
+for=client | replication
+namespace=some/path/
+
+All fields in a section are optional. If the "for" key is missing, the server
+will be used for replication and will be sent to clients that request a list
+of alt servers.
+The namespace key can be specified multiple times per section. If it is missing,
+the server will be used for all image names; otherwise, it will only be used
+for images which's name starts with one of the given strings.
 
 If you're not running in proxy mode, this file won't do much for you
 
diff --git a/conf/alt-servers b/conf/alt-servers
index e69de29..b26fe79 100644
--- a/conf/alt-servers
+++ b/conf/alt-servers
@@ -0,0 +1,14 @@
+[192.168.100.10]
+comment=Some alt server
+
+[192.168.100.100]
+comment=My first alt server that will not be used for replication
+for=client
+[192.168.100.50]
+comment=Super sectret alt server that will be used for replication, but clients don't know about it
+for=replication
+
+[192.168.100.123]
+comment=Also just for replication, and only for images starting with foobar/baz/
+namespace=foobar/baz/
+for=replication
diff --git a/conf/server.conf b/conf/server.conf
index 5f11ed8..d9d4094 100644
--- a/conf/server.conf
+++ b/conf/server.conf
@@ -13,9 +13,10 @@ isProxy=true
 backgroundReplication=true
 ; minimum amount of connected clients for background replication to kick in
 bgrMinClients=0
-; if isProxy==true and another proxy requests and image that we don't have, should we ask our alt-servers for it?
+; if another proxy requests and image that we don't have, should we ask our alt-servers for it?
 lookupMissingForProxy=true
-; create sparse files instead of preallocating; ignored if backgroundReplication=true -- only recommended if cache space is small
+; create sparse files instead of preallocating; ignored if backgroundReplication=true
+; -- only recommended if cache space is small
 sparseFiles=false
 ; if true (which is the default), images will automatically be removed from the list if they can't be accessed
 removeMissingImages=true
@@ -27,6 +28,20 @@ clientTimeout=15000
 closeUnusedFd=false
 ; set this to true to load files without the .r[0-9]+ extension too, assuming RID=1
 vmdkLegacyMode=false
+; Don't set the server flag when connecting to alt-servers
+; Intended for if the proxy is used for on-client caching
+pretendClient=false
+; When running in proxy mode and running out of space, automatically delete oldest image(s) to make
+; the newly replicated image fit. In sparse mode, this will make sure at least 2GB of free space are
+; available when replicating a new image. During normal operation, it will free at least 256MB whenever
+; an attempt to write more data to cache fails. In non-sparse mode, whenever a new image is replicated,
+; as much space as is required to store the entire image will be made available.
+; However, after startup the proxy will refuse to delete any images for the time span given below, to be
+; able to gather up to date usage information for the images available. If unitless, the value is
+; interpreted in seconds. Valid suffixes are m, h, d.
+; Setting this to -1 disables deletion of images. If the cache partition is full, no more images will
+; be replicated unless you manually free up more disk space.
+autoFreeDiskSpaceDelay=10h
 
 [limits]
 maxClients=2000