From 30107e38f393aa6d3de43ada6c5b88c7a0f36911 Mon Sep 17 00:00:00 2001 From: Yogesh Mahajan Date: Tue, 16 May 2023 11:28:48 +0530 Subject: [PATCH] Ensure that "pause replay of wal"/"resume replay of wal" are enabled/disabled appropriately. #6026 --- web/pgadmin/browser/server_groups/servers/__init__.py | 6 ++++-- .../browser/server_groups/servers/static/js/server.js | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/__init__.py b/web/pgadmin/browser/server_groups/servers/__init__.py index bf4ce74e6..8ce34197d 100644 --- a/web/pgadmin/browser/server_groups/servers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/__init__.py @@ -1793,7 +1793,7 @@ class ServerNode(PGChildNodeView): try: manager = get_driver(PG_DEFAULT_DRIVER).connection_manager(sid) conn = manager.connection() - + msg = None # Execute SQL to pause or resume WAL replay if conn.connected(): if pause: @@ -1806,6 +1806,7 @@ class ServerNode(PGChildNodeView): return internal_server_error( errormsg=str(res) ) + msg = gettext('WAL replay paused') else: sql = "SELECT pg_xlog_replay_resume();" if manager.version >= 100000: @@ -1816,9 +1817,10 @@ class ServerNode(PGChildNodeView): return internal_server_error( errormsg=str(res) ) + msg = gettext('WAL replay resumed') return make_json_response( success=1, - info=gettext('WAL replay paused'), + info=msg, data={'in_recovery': True, 'wal_pause': pause} ) return gone(errormsg=gettext('Please connect the server.')) diff --git a/web/pgadmin/browser/server_groups/servers/static/js/server.js b/web/pgadmin/browser/server_groups/servers/static/js/server.js index 1f85e4a53..96008d7b5 100644 --- a/web/pgadmin/browser/server_groups/servers/static/js/server.js +++ b/web/pgadmin/browser/server_groups/servers/static/js/server.js @@ -380,7 +380,7 @@ define('pgadmin.node.server', [ getApiInstance().delete( obj.generate_url(i, 'wal_replay' , d, true) ).then(({data: res})=> { - obj.on_done(res, t, i); + obj.callbacks.on_done(res, t, i); }).catch(function(error) { Notify.pgRespErrorNotify(error); t.unload(i); @@ -401,7 +401,7 @@ define('pgadmin.node.server', [ getApiInstance().put( obj.generate_url(i, 'wal_replay' , d, true) ).then(({data: res})=> { - obj.on_done(res, t, i); + obj.callbacks.on_done(res, t, i); }).catch(function(error) { Notify.pgRespErrorNotify(error); t.unload(i);