From c75b3e6bb0125a7c03e7fed2c4603a951b1c7629 Mon Sep 17 00:00:00 2001 From: Carla Schroder Date: Wed, 3 Jun 2015 10:58:38 -0700 Subject: [PATCH 1/4] 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 From e32d39527ac79d5fb1c66a190b78f23a54f19aa3 Mon Sep 17 00:00:00 2001 From: Carla Schroder Date: Thu, 4 Jun 2015 12:53:29 -0700 Subject: [PATCH 2/4] php-redis --- .../configuration_files/files_locking_experimental.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/admin_manual/configuration_files/files_locking_experimental.rst b/admin_manual/configuration_files/files_locking_experimental.rst index 7c6fc8541..59f88d89c 100644 --- a/admin_manual/configuration_files/files_locking_experimental.rst +++ b/admin_manual/configuration_files/files_locking_experimental.rst @@ -19,6 +19,10 @@ The new file locking mechanism has these capabilities: * Manages locks correctly on external storage mounts * Manages encrypted files correctly +You must install the ``php-redis`` module for the new file locking to work. On +Debian/Ubuntu/Mint this is ``php5-redis``, and on Red Hat/CentOS/Fedora is it +``php-pecl-redis`` in the EPEL repository. + 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 From 7d90187ccf4f8634abbf7b96df6fdfed8ee0eb48 Mon Sep 17 00:00:00 2001 From: Carla Schroder Date: Wed, 10 Jun 2015 12:34:14 -0700 Subject: [PATCH 3/4] correct typo files locking redis --- .../configuration_files/files_locking_experimental.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/admin_manual/configuration_files/files_locking_experimental.rst b/admin_manual/configuration_files/files_locking_experimental.rst index 59f88d89c..9c3405e00 100644 --- a/admin_manual/configuration_files/files_locking_experimental.rst +++ b/admin_manual/configuration_files/files_locking_experimental.rst @@ -4,7 +4,8 @@ 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. +to use the new file locking mechanism make sure you disable the File Locking +app. The new file locking mechanism has these capabilities: @@ -32,7 +33,7 @@ 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', + 'memcache.local' => '\\OC\\Memcache\\Redis', 'redis' => array( 'host' => 'localhost', // can also be a unix domain socket: From 55c7fdb31e66bcb2eea63461fbc652a9066ed498 Mon Sep 17 00:00:00 2001 From: Carla Schroder Date: Wed, 10 Jun 2015 12:50:42 -0700 Subject: [PATCH 4/4] more tweaks to experimental file lock --- .../files_locking_experimental.rst | 6 ++++++ admin_manual/images/file-lock-status.png | Bin 0 -> 8350 bytes 2 files changed, 6 insertions(+) create mode 100644 admin_manual/images/file-lock-status.png diff --git a/admin_manual/configuration_files/files_locking_experimental.rst b/admin_manual/configuration_files/files_locking_experimental.rst index 9c3405e00..cb59013d1 100644 --- a/admin_manual/configuration_files/files_locking_experimental.rst +++ b/admin_manual/configuration_files/files_locking_experimental.rst @@ -45,5 +45,11 @@ requires a simple configuration in your ``config.php`` file, like this example:: 'dbindex' => 0, ), +The **Server status** section on your ownCloud Admin page indicates whether +experimental file locking is enabled or disabled, and if it is configured +correctly. + +.. figure:: ../images/file-lock-status.png + See ``config.sample.php`` to see configuration examples for Redis, and for all supported memcaches. diff --git a/admin_manual/images/file-lock-status.png b/admin_manual/images/file-lock-status.png new file mode 100644 index 0000000000000000000000000000000000000000..ad5676feb97e70996a663c1d8fb636d9a6086057 GIT binary patch literal 8350 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