From c75b3e6bb0125a7c03e7fed2c4603a951b1c7629 Mon Sep 17 00:00:00 2001 From: Carla Schroder Date: Wed, 3 Jun 2015 10:58:38 -0700 Subject: [PATCH] new page for experimental file locking --- .../files_locking_experimental.rst | 44 +++++++++++++++++++ admin_manual/configuration_files/index.rst | 13 +++--- 2 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 admin_manual/configuration_files/files_locking_experimental.rst diff --git a/admin_manual/configuration_files/files_locking_experimental.rst b/admin_manual/configuration_files/files_locking_experimental.rst new file mode 100644 index 000000000..7c6fc8541 --- /dev/null +++ b/admin_manual/configuration_files/files_locking_experimental.rst @@ -0,0 +1,44 @@ +========================= +Experimental File Locking +========================= + +ownCloud's new experimental file locking mechanism operates differently than +the old File Locking application, and will eventually replace it. If you elect +to use the new file locking make sure you disable the File Locking app. + +The new file locking mechanism has these capabilities: + +* Operates at a higher level than the filesystem, so you don't need to use a + filesystem that supports locking +* Locks parent directories so they cannot be renamed during any activity on + files inside the directories +* Releases locks after file transactions are interrupted, for + example when a sync client loses the connection during an upload +* Manage locking and releasing locks correctly on shared files during changes + from multiple users +* Manages locks correctly on external storage mounts +* Manages encrypted files correctly + +We recommend using `Redis `_ as your ownCloud memcache when +you enable file locking. Memcached, the popular distributed memory caching +system, is not suitable for the new file locking because it is not designed to +store locks, and data can disappear from the cache at any time. Redis is a +key-value store, and it guarantees that cached objects are available for as +long as they are needed. Redis is available on most Linux distributions, and +requires a simple configuration in your ``config.php`` file, like this example:: + + 'filelocking.enabled' => 'true', + 'memcache.local' => '\\OC\\Memcache\\redis', + 'redis' => array( + 'host' => 'localhost', + // can also be a unix domain socket: + '/tmp/redis.sock' + 'port' => 6379, + 'timeout' => 0.0, + // Optional, if undefined SELECT will not run and will use Redis + // Server's default DB Index. + 'dbindex' => 0, + ), + +See ``config.sample.php`` to see configuration examples for Redis, and for all +supported memcaches. diff --git a/admin_manual/configuration_files/index.rst b/admin_manual/configuration_files/index.rst index a07840415..751f213a5 100644 --- a/admin_manual/configuration_files/index.rst +++ b/admin_manual/configuration_files/index.rst @@ -6,15 +6,16 @@ File Sharing and Management .. toctree:: :maxdepth: 2 - file_sharing_configuration.rst - big_file_upload_configuration.rst + file_sharing_configuration + big_file_upload_configuration collaborative_documents_configuration - default_files_configuration.rst + default_files_configuration external_storage_configuration_gui external_storage_configuration - encryption_configuration.rst - files_locking_enabling.rst - federated_cloud_sharing_configuration.rst + encryption_configuration + files_locking_enabling + files_locking_experimental + federated_cloud_sharing_configuration previews_configuration serving_static_files_configuration \ No newline at end of file