From b2a37066e5db9bccd75290adb833f4452e0f9657 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Mon, 15 Nov 2021 12:31:31 -0500 Subject: [PATCH] 18308: enable collection versioning by default, with a 30s idle timeout. Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- doc/admin/collection-versioning.html.textile.liquid | 4 ++-- doc/admin/keep-recovering-data.html.textile.liquid | 2 +- lib/config/config.default.yml | 4 ++-- lib/config/generated_config.go | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/admin/collection-versioning.html.textile.liquid b/doc/admin/collection-versioning.html.textile.liquid index 29b0bcd506..d33b9d2e2b 100644 --- a/doc/admin/collection-versioning.html.textile.liquid +++ b/doc/admin/collection-versioning.html.textile.liquid @@ -23,13 +23,13 @@ There are 2 configuration settings in the @Collections@ section of @config.yml@ # is older than the amount of seconds defined on PreserveVersionIfIdle, # a snapshot of the collection's previous state is created and linked to # the current collection. - CollectionVersioning: false + CollectionVersioning: true # This setting control the auto-save aspect of collection versioning, and can be set to: # 0s = auto-create a new version on every update. # -1s = never auto-create new versions. # > 0s = auto-create a new version when older than the specified number of seconds. - PreserveVersionIfIdle: -1s + PreserveVersionIfIdle: 30s Note that if you set @CollectionVersioning@ to @false@ after being enabled, old versions will still be accessible, but further changes will not be versioned. diff --git a/doc/admin/keep-recovering-data.html.textile.liquid b/doc/admin/keep-recovering-data.html.textile.liquid index 14e25dd11c..8d71a765e6 100644 --- a/doc/admin/keep-recovering-data.html.textile.liquid +++ b/doc/admin/keep-recovering-data.html.textile.liquid @@ -24,7 +24,7 @@ Multiple collections may share a _portable data hash_, i.e. have the same conten h2(#check_collection_versioning). Consider collection versioning -Arvados supports collection versioning. If it has been "enabled":{{ site.baseurl }}/admin/collection-versioning.html on your cluster, the deleted collection may be recoverable from an older version. See "Using collection versioning":{{ site.baseurl }}/user/topics/collection-versioning.html for details. +Arvados supports collection versioning. If it has not been "disabled":{{ site.baseurl }}/admin/collection-versioning.html on your cluster, the deleted collection may be recoverable from an older version. See "Using collection versioning":{{ site.baseurl }}/user/topics/collection-versioning.html for details. h2(#recover_collection). Recovering collections diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml index 411a79650b..04f0c81acc 100644 --- a/lib/config/config.default.yml +++ b/lib/config/config.default.yml @@ -497,12 +497,12 @@ Clusters: # is older than the amount of seconds defined on PreserveVersionIfIdle, # a snapshot of the collection's previous state is created and linked to # the current collection. - CollectionVersioning: false + CollectionVersioning: true # 0s = auto-create a new version on every update. # -1s = never auto-create new versions. # > 0s = auto-create a new version when older than the specified number of seconds. - PreserveVersionIfIdle: -1s + PreserveVersionIfIdle: 30s # If non-empty, allow project and collection names to contain # the "/" character (slash/stroke/solidus), and replace "/" with diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go index f8553c3eb7..11ee62a6ba 100644 --- a/lib/config/generated_config.go +++ b/lib/config/generated_config.go @@ -503,12 +503,12 @@ Clusters: # is older than the amount of seconds defined on PreserveVersionIfIdle, # a snapshot of the collection's previous state is created and linked to # the current collection. - CollectionVersioning: false + CollectionVersioning: true # 0s = auto-create a new version on every update. # -1s = never auto-create new versions. # > 0s = auto-create a new version when older than the specified number of seconds. - PreserveVersionIfIdle: -1s + PreserveVersionIfIdle: 30s # If non-empty, allow project and collection names to contain # the "/" character (slash/stroke/solidus), and replace "/" with -- 2.30.2