Skip to content

Commit a1be31d

Browse files
SomeoneToIgnoretristan957
authored andcommitted
Remove callmemaybe bits from compute (#172)
1 parent e9859c7 commit a1be31d

File tree

3 files changed

+0
-30
lines changed

3 files changed

+0
-30
lines changed

contrib/neon/libpagestore.c

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -71,25 +71,6 @@ zenith_connect()
7171
errdetail_internal("%s", msg)));
7272
}
7373

74-
/* Ask the Page Server to connect to us, and stream WAL from us. */
75-
if (callmemaybe_connstring && callmemaybe_connstring[0]
76-
&& zenith_tenant
77-
&& zenith_timeline)
78-
{
79-
PGresult *res;
80-
81-
query = psprintf("callmemaybe %s %s %s", zenith_tenant, zenith_timeline, callmemaybe_connstring);
82-
res = PQexec(pageserver_conn, query);
83-
if (PQresultStatus(res) != PGRES_COMMAND_OK)
84-
{
85-
PQfinish(pageserver_conn);
86-
pageserver_conn = NULL;
87-
zenith_log(ERROR,
88-
"[ZENITH_SMGR] callmemaybe command failed");
89-
}
90-
PQclear(res);
91-
}
92-
9374
query = psprintf("pagestream %s %s", zenith_tenant, zenith_timeline);
9475
ret = PQsendQuery(pageserver_conn, query);
9576
if (ret != 1)
@@ -383,15 +364,6 @@ _PG_init(void)
383364
0, /* no flags required */
384365
NULL, NULL, NULL);
385366

386-
DefineCustomStringVariable("neon.callmemaybe_connstring",
387-
"Connection string that Page Server or WAL safekeeper should use to connect to us",
388-
NULL,
389-
&callmemaybe_connstring,
390-
"",
391-
PGC_POSTMASTER,
392-
0, /* no flags required */
393-
NULL, NULL, NULL);
394-
395367
DefineCustomStringVariable("neon.timeline_id",
396368
"Zenith timelineid the server is running on",
397369
NULL,

contrib/neon/pagestore_client.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ typedef struct
147147
extern page_server_api *page_server;
148148

149149
extern char *page_server_connstring;
150-
extern char *callmemaybe_connstring;
151150
extern char *zenith_timeline;
152151
extern char *zenith_tenant;
153152
extern bool wal_redo;

contrib/neon/pagestore_smgr.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ page_server_api *page_server;
8888

8989
/* GUCs */
9090
char *page_server_connstring; // with substituted password
91-
char *callmemaybe_connstring;
9291
char *zenith_timeline;
9392
char *zenith_tenant;
9493
bool wal_redo = false;

0 commit comments

Comments
 (0)