sync files from upstream

couchbase · Feb 14, 2022 · c5eabd9 · c5eabd9
1 parent fcc2790
commit c5eabd9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/docs/api/api_docs.yaml b/docs/api/api_docs.yaml
@@ -5646,6 +5646,7 @@ components:
         allow_conflicts:
           type: boolean
           default: true
+          deprecated: true
           description: This controls whether to allow conflicting document revisions.
         num_index_replicas:
           type: number

diff --git a/rest/config.go b/rest/config.go
@@ -136,7 +136,7 @@ type DbConfig struct {
 	SecureCookieOverride             *bool                            `json:"session_cookie_secure,omitempty"`                // Override cookie secure flag
 	SessionCookieName                string                           `json:"session_cookie_name,omitempty"`                  // Custom per-database session cookie name
 	SessionCookieHTTPOnly            *bool                            `json:"session_cookie_http_only,omitempty"`             // HTTP only cookies
-	AllowConflicts                   *bool                            `json:"allow_conflicts,omitempty"`                      // False forbids creating conflicts
+	AllowConflicts                   *bool                            `json:"allow_conflicts,omitempty"`                      // Deprecated: False forbids creating conflicts
 	NumIndexReplicas                 *uint                            `json:"num_index_replicas,omitempty"`                   // Number of GSI index replicas used for core indexes
 	UseViews                         *bool                            `json:"use_views,omitempty"`                            // Force use of views instead of GSI
 	SendWWWAuthenticateHeader        *bool                            `json:"send_www_authenticate_header,omitempty"`         // If false, disables setting of 'WWW-Authenticate' header in 401 responses

diff --git a/rest/server_context.go b/rest/server_context.go
@@ -771,6 +771,10 @@ func dbcOptionsFromConfig(sc *ServerContext, config *DbConfig, dbName string) (d
 		groupID = sc.config.Bootstrap.ConfigGroupID
 	}
 
+	if config.AllowConflicts != nil && *config.AllowConflicts {
+		base.Warnf(`Deprecation notice: setting database configuration option "allow_conflicts" to true is due to be removed. In the future, conflicts will not be allowed.`)
+	}
+
 	// Register the cbgt pindex type for the configGroup
 	db.RegisterImportPindexImpl(groupID)