1 files changed, 95 insertions, 23 deletions

diff --git a/src/third_party/wiredtiger/src/conn/conn_reconfig.c b/src/third_party/wiredtiger/src/conn/conn_reconfig.c
index 216637f41bb..45c5754baf0 100644
--- a/src/third_party/wiredtiger/src/conn/conn_reconfig.c
+++ b/src/third_party/wiredtiger/src/conn/conn_reconfig.c
@@ -49,16 +49,22 @@ __wt_conn_compat_config(
 {
 	WT_CONFIG_ITEM cval;
 	WT_CONNECTION_IMPL *conn;
-	uint16_t major, minor;
+	WT_DECL_RET;
+	uint16_t min_major, min_minor, rel_major, rel_minor;
+	char *value;
 	bool txn_active;
 
 	conn = S2C(session);
+	value = NULL;
+
 	WT_RET(__wt_config_gets(session, cfg, "compatibility.release", &cval));
 	if (cval.len == 0) {
-		conn->compat_major = WIREDTIGER_VERSION_MAJOR;
-		conn->compat_minor = WIREDTIGER_VERSION_MINOR;
+		rel_major = WIREDTIGER_VERSION_MAJOR;
+		rel_minor = WIREDTIGER_VERSION_MINOR;
+		F_CLR(conn, WT_CONN_COMPATIBILITY);
 	} else {
-		WT_RET(__conn_compat_parse(session, &cval, &major, &minor));
+		WT_RET(__conn_compat_parse(
+		    session, &cval, &rel_major, &rel_minor));
 
 		/*
 		 * We're doing an upgrade or downgrade, check whether
@@ -69,16 +75,14 @@ __wt_conn_compat_config(
 			WT_RET_MSG(session, ENOTSUP,
 			    "system must be quiescent"
 			    " for upgrade or downgrade");
-		conn->compat_major = major;
-		conn->compat_minor = minor;
+		F_SET(conn, WT_CONN_COMPATIBILITY);
 	}
-
 	/*
-	 * The required minimum cannot be set via reconfigure and it is
-	 * meaningless on a newly created database. We're done in those cases.
+	 * If we're a reconfigure and the user did not set any compatibility,
+	 * we're done.
 	 */
-	if (reconfig || conn->is_new)
-		return (0);
+	if (reconfig && !F_ISSET(conn, WT_CONN_COMPATIBILITY))
+		goto done;
 
 	/*
 	 * The minimum required version for existing files is only available
@@ -87,24 +91,92 @@ __wt_conn_compat_config(
 	WT_RET(__wt_config_gets(session,
 	    cfg, "compatibility.require_min", &cval));
 	if (cval.len == 0) {
-		conn->compat_req_major = WT_CONN_COMPAT_NONE;
-		conn->compat_req_minor = WT_CONN_COMPAT_NONE;
-		return (0);
-	}
-	WT_RET(__conn_compat_parse(session, &cval, &major, &minor));
+		min_major = WT_CONN_COMPAT_NONE;
+		min_minor = WT_CONN_COMPAT_NONE;
+	} else
+		WT_RET(__conn_compat_parse(
+		    session, &cval, &min_major, &min_minor));
 
 	/*
 	 * The minimum required must be less than or equal to the compatibility
-	 * release if one was set.
+	 * release if one was set. This is on an open and we're checking the
+	 * two against each other. We'll check against what was saved on a
+	 * restart later.
 	 */
-	if ((major > conn->compat_major) ||
-	    (major == conn->compat_major && minor > conn->compat_minor))
+	if (!reconfig && F_ISSET(conn, WT_CONN_COMPATIBILITY) &&
+	    min_major != WT_CONN_COMPAT_NONE &&
+	    (min_major > rel_major ||
+	    (min_major == rel_major && min_minor > rel_minor)))
 		WT_RET_MSG(session, ENOTSUP,
-		    "required min cannot be larger than compatibility release");
-	conn->compat_req_major = major;
-	conn->compat_req_minor = minor;
+		    "required min of %" PRIu16 ".%" PRIu16
+		    "cannot be larger than compatibility release %"
+		    PRIu16 ".%" PRIu16,
+		    min_major, min_minor, rel_major, rel_minor);
 
-	return (0);
+	/*
+	 * On a reconfigure, check the new release version against any
+	 * required minimum version set on open.
+	 */
+	if (reconfig && conn->compat_req_major != WT_CONN_COMPAT_NONE &&
+	    (conn->compat_req_major > rel_major ||
+	    (conn->compat_req_major == rel_major &&
+	    conn->compat_req_minor > rel_minor)))
+		WT_RET_MSG(session, ENOTSUP,
+		    "required min of %" PRIu16 ".%" PRIu16
+		    "cannot be larger than requested compatibility release %"
+		    PRIu16 ".%" PRIu16,
+		    conn->compat_req_major, conn->compat_req_minor,
+		    rel_major, rel_minor);
+
+	conn->compat_major = rel_major;
+	conn->compat_minor = rel_minor;
+
+	/*
+	 * Only rewrite the turtle file if this is a reconfig. On startup
+	 * it will get written as part of creating the connection. We do this
+	 * after checking the required minimum version so that we don't rewrite
+	 * the turtle file if there is an error.
+	 */
+	if (reconfig)
+		WT_RET(__wt_metadata_turtle_rewrite(session));
+
+	/*
+	 * The required minimum cannot be set via reconfigure and it is
+	 * meaningless on a newly created database. We're done in those cases.
+	 */
+	if (reconfig || conn->is_new || min_major == WT_CONN_COMPAT_NONE)
+		goto done;
+
+	/*
+	 * Check the minimum required against any saved compatibility version
+	 * in the turtle file saved from an earlier run.
+	 */
+	rel_major = rel_minor = WT_CONN_COMPAT_NONE;
+	if ((ret =
+	    __wt_metadata_search(session, WT_METADATA_COMPAT, &value)) == 0) {
+		WT_ERR(__wt_config_getones(session, value, "major", &cval));
+		rel_major = (uint16_t)cval.val;
+		WT_ERR(__wt_config_getones(session, value, "minor", &cval));
+		rel_minor = (uint16_t)cval.val;
+		if (min_major > rel_major ||
+		    (min_major == rel_major && min_minor > rel_minor))
+			WT_ERR_MSG(session, ENOTSUP,
+			    "required min of %" PRIu16 ".%" PRIu16
+			    "cannot be larger than saved release %"
+			    PRIu16 ".%" PRIu16,
+			    min_major, min_minor, rel_major, rel_minor);
+	} else if (ret == WT_NOTFOUND)
+		ret = 0;
+	else
+		WT_ERR(ret);
+
+	conn->compat_req_major = min_major;
+	conn->compat_req_minor = min_minor;
+done:
+err:	if (value != NULL)
+		__wt_free(session, value);
+
+	return (ret);
 }
 
 /*