Don't disable commit_ts in standby if enabled locally

alvherre · alvherre · commit e06b2e1d2ecd · 2015-10-02T12:49:01.000-03:00
Bug noticed by Fujii Masao
diff --git a/src/backend/access/transam/commit_ts.c b/src/backend/access/transam/commit_ts.c
@@ -583,14 +583,15 @@ CommitTsParameterChange(bool newvalue, bool oldvalue)
 	 * pg_control.  If the old value was already set, we already did this, so
 	 * don't do anything.
 	 *
-	 * If the module is disabled in the master, disable it here too.
+	 * If the module is disabled in the master, disable it here too, unless
+	 * the module is enabled locally.
 	 */
 	if (newvalue)
 	{
 		if (!track_commit_timestamp && !oldvalue)
 			ActivateCommitTs();
 	}
-	else if (oldvalue)
+	else if (!track_commit_timestamp && oldvalue)
 		DeactivateCommitTs(false);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -583,14 +583,15 @@ CommitTsParameterChange(bool newvalue, bool oldvalue)`
`583`	`583`	`* pg_control. If the old value was already set, we already did this, so`
`584`	`584`	`* don't do anything.`
`585`	`585`	`*`
`586`		`- * If the module is disabled in the master, disable it here too.`
	`586`	`+ * If the module is disabled in the master, disable it here too, unless`
	`587`	`+ * the module is enabled locally.`
`587`	`588`	`*/`
`588`	`589`	`if (newvalue)`
`589`	`590`	`{`
`590`	`591`	`if (!track_commit_timestamp && !oldvalue)`
`591`	`592`	`ActivateCommitTs();`
`592`	`593`	`}`
`593`		`- else if (oldvalue)`
	`594`	`+ else if (!track_commit_timestamp && oldvalue)`
`594`	`595`	`DeactivateCommitTs(false);`
`595`	`596`	`}`
`596`	`597`