Don't disable commit_ts in standby if enabled locally

Bug noticed by Fujii Masao

diff --git a/src/backend/access/transam/commit_ts.c b/src/backend/access/transam/commit_ts.c
index 79ca04a6eafd285d44e2db6e6d57fc6a54990ed0..24b8291083546a1a9ca8d51892ba2e2d38e6867d 100644 (file)
--- 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);
 }