Skip to content

Commit

Permalink
Remove callmemaybe bits from compute (#172)
Browse files Browse the repository at this point in the history
  • Loading branch information
SomeoneToIgnore authored and tristan957 committed Feb 5, 2024
1 parent 10ea334 commit 214c91b
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 30 deletions.
28 changes: 0 additions & 28 deletions contrib/neon/libpagestore.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,6 @@ zenith_connect()
errdetail_internal("%s", msg)));
}

/* Ask the Page Server to connect to us, and stream WAL from us. */
if (callmemaybe_connstring && callmemaybe_connstring[0]
&& zenith_tenant
&& zenith_timeline)
{
PGresult *res;

query = psprintf("callmemaybe %s %s %s", zenith_tenant, zenith_timeline, callmemaybe_connstring);
res = PQexec(pageserver_conn, query);
if (PQresultStatus(res) != PGRES_COMMAND_OK)
{
PQfinish(pageserver_conn);
pageserver_conn = NULL;
zenith_log(ERROR,
"[ZENITH_SMGR] callmemaybe command failed");
}
PQclear(res);
}

query = psprintf("pagestream %s %s", zenith_tenant, zenith_timeline);
ret = PQsendQuery(pageserver_conn, query);
if (ret != 1)
Expand Down Expand Up @@ -383,15 +364,6 @@ _PG_init(void)
0, /* no flags required */
NULL, NULL, NULL);

DefineCustomStringVariable("neon.callmemaybe_connstring",
"Connection string that Page Server or WAL safekeeper should use to connect to us",
NULL,
&callmemaybe_connstring,
"",
PGC_POSTMASTER,
0, /* no flags required */
NULL, NULL, NULL);

DefineCustomStringVariable("neon.timeline_id",
"Zenith timelineid the server is running on",
NULL,
Expand Down
1 change: 0 additions & 1 deletion contrib/neon/pagestore_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ typedef struct
extern page_server_api *page_server;

extern char *page_server_connstring;
extern char *callmemaybe_connstring;
extern char *zenith_timeline;
extern char *zenith_tenant;
extern bool wal_redo;
Expand Down
1 change: 0 additions & 1 deletion contrib/neon/pagestore_smgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ page_server_api *page_server;

/* GUCs */
char *page_server_connstring; // with substituted password
char *callmemaybe_connstring;
char *zenith_timeline;
char *zenith_tenant;
bool wal_redo = false;
Expand Down

0 comments on commit 214c91b

Please sign in to comment.