Skip to content

G
Gpdb

Greenplum / Gpdb

通知 7
Star 1
Fork 0
G
Gpdb

体验新版 GitCode，发现更多精彩内容 >>

提交 696a3080 编写于 作者: D Daniel Gustafsson
浏览文件
操作

Revamp commandline construction and string handling in cbd_restore_agent 

This patch started out as a small refactor of executable discovery due to
the function having multiple leaks, but turned into a revamping of the way
the commandlines are constructed (since that's where the executable paths
were used). The changes introduced in this diff are:

    - Build the commandlines in PQExpBuffers instead of fixed size buffer
      believed to be large enough
    - Move commandline functions from cdb_dump_util into cdb_restore_agent
      as that's the only callsite, no need to link that code into other
      binaries. Also refactor the functions significantly as there were
      many functions doing essentially the same thing.
    - Remove code to find executables and just use find_other_exec() since
      all binaries are in the same folder
    - Change shellEscape() to not always resetting the PQExpBuffer, also
      use the same code as in src/backend/cdb/cdbbackup.c which handles
      quoting as well
    - Remove various small functions that only returned a static string
      and variables holding a static string
    - Use MAXPGPATH instead of locally defined macro for the same thing
    - Remove the highly uninteresting unittests for string concatenation
上级 ce84e151
展开全部 隐藏空白更改
内联 并排
Showing with 184 addition and 1656 deletion
src/bin/pg_dump/cdb/cdb_ddboost_util.c
浏览文件 @ 696a3080
......@@ -904,9 +904,9 @@ addPassThroughLongParm(const char *Parm, const char *pszValue, char *pszPassThro
PQExpBuffer valueBuf = createPQExpBuffer();
if (bFirstTime)
pszRtn = MakeString("--%s \"%s\"", Parm, shellEscape(pszValue, valueBuf));
pszRtn = MakeString("--%s \"%s\"", Parm, shellEscape(pszValue, valueBuf, false, false));
else
pszRtn = MakeString("%s --%s \"%s\"", pszPassThroughParmString, Parm, shellEscape(pszValue, valueBuf));
pszRtn = MakeString("%s --%s \"%s\"", pszPassThroughParmString, Parm, shellEscape(pszValue, valueBuf, false, false));
destroyPQExpBuffer(valueBuf);
}
......
src/bin/pg_dump/cdb/cdb_dump.c
浏览文件 @ 696a3080
......@@ -263,9 +263,9 @@ addPassThroughParm(char Parm, const char *pszValue, char *pszPassThroughParmStri
PQExpBuffer valueBuf = createPQExpBuffer();
if (bFirstTime)
pszRtn = MakeString("-%c \"%s\"", Parm, shellEscape(pszValue, valueBuf));
pszRtn = MakeString("-%c \"%s\"", Parm, shellEscape(pszValue, valueBuf, false, false));
else
pszRtn = MakeString("%s -%c \"%s\"", pszPassThroughParmString, Parm, shellEscape(pszValue, valueBuf));
pszRtn = MakeString("%s -%c \"%s\"", pszPassThroughParmString, Parm, shellEscape(pszValue, valueBuf, false, false));
destroyPQExpBuffer(valueBuf);
}
......@@ -306,9 +306,9 @@ addPassThroughLongParm(const char *Parm, const char *pszValue, char *pszPassThro
PQExpBuffer valueBuf = createPQExpBuffer();
if (bFirstTime)
pszRtn = MakeString("--%s \"%s\"", Parm, shellEscape(pszValue, valueBuf));
pszRtn = MakeString("--%s \"%s\"", Parm, shellEscape(pszValue, valueBuf, false, false));
else
pszRtn = MakeString("%s --%s \"%s\"", pszPassThroughParmString, Parm, shellEscape(pszValue, valueBuf));
pszRtn = MakeString("%s --%s \"%s\"", pszPassThroughParmString, Parm, shellEscape(pszValue, valueBuf, false, false));
destroyPQExpBuffer(valueBuf);
}
......@@ -1737,11 +1737,9 @@ reportBackupResults(InputOptions inputopts, ThreadParmArray *pParmAr)
appendPQExpBuffer(reportBuf, "Compression Program: %s\n",
StringNotNull(pParm0->pOptionsData->pszCompressionProgram, "None"));
appendPQExpBuffer(reportBuf, "%s", getBackupTypeString(incremental_backup));
appendPQExpBuffer(reportBuf, "\n");
appendPQExpBuffer(reportBuf, "Backup Type: %s\n", (incremental_backup ? "Incremental" : "Full"));
appendPQExpBuffer(reportBuf, "\n");
appendPQExpBuffer(reportBuf, "Individual Results\n");
appendPQExpBuffer(reportBuf, "\nIndividual Results\n");
failCount = 0;
errorCount = 0;
......
src/bin/pg_dump/cdb/cdb_dump_util.c
浏览文件 @ 696a3080
......@@ -979,241 +979,6 @@ parseDbidSet(int *dbidset, char *dump_set)
return count;
}
const char*
getBackupTypeString(bool incremental)
{
if (incremental)
{
return "Backup Type: Incremental";
}
else
{
return "Backup Type: Full";
}
}
char*
formCompressionProgramString(char* compPg)
{
char extra[] = " -c ";
char* retVal = realloc(compPg, strlen(compPg) + sizeof(extra) + 2);
if (retVal)
{
strcat(retVal, extra); /* decompress to stdout */
}
return retVal;
}
void
formPostDataSchemaOnlyPsqlCommandLine(char** retVal, const char* inputFileSpec, bool compUsed, const char* compProg,
const char* post_data_filter_script, const char* table_filter_file,
const char* psqlPg, const char* catPg,
const char* gpNBURestorePg, const char* netbackupServiceHost, const char* netbackupBlockSize,
const char* change_schema_file, const char *schema_level_file)
{
char* pszCmdLine = *retVal;
if (compUsed)
{
if (netbackupServiceHost)
{
strncpy(pszCmdLine, gpNBURestorePg, (1 + strlen(gpNBURestorePg)));
strncat(pszCmdLine, " --netbackup-service-host ", strlen(" --netbackup-service-host "));
strncat(pszCmdLine, netbackupServiceHost, strlen(netbackupServiceHost));
strncat(pszCmdLine, " --netbackup-filename ", strlen(" --netbackup-filename "));
strncat(pszCmdLine, inputFileSpec, strlen(inputFileSpec));
if (netbackupBlockSize)
{
strncat(pszCmdLine, " --netbackup-block-size ", strlen(" --netbackup-block-size "));
strncat(pszCmdLine, netbackupBlockSize, strlen(netbackupBlockSize));
}
strncat(pszCmdLine, " | ", strlen(" | "));
strncat(pszCmdLine, compProg, strlen(compProg));
}
else
{
strcpy(pszCmdLine, catPg);
strcat(pszCmdLine, " ");
strcat(pszCmdLine, inputFileSpec);
strcat(pszCmdLine, " | ");
strcat(pszCmdLine, compProg);
}
formPostDataFilterCommandLine(&pszCmdLine, post_data_filter_script, table_filter_file, change_schema_file, schema_level_file);
strcat(pszCmdLine, " | ");
strcat(pszCmdLine, psqlPg);
}
else
{
if (netbackupServiceHost)
{
strncpy(pszCmdLine, gpNBURestorePg, (1 + strlen(gpNBURestorePg)));
strncat(pszCmdLine, " --netbackup-service-host ", strlen(" --netbackup-service-host "));
strncat(pszCmdLine, netbackupServiceHost, strlen(netbackupServiceHost));
strncat(pszCmdLine, " --netbackup-filename ", strlen(" --netbackup-filename "));
strncat(pszCmdLine, inputFileSpec, strlen(inputFileSpec));
if (netbackupBlockSize)
{
strncat(pszCmdLine, " --netbackup-block-size ", strlen(" --netbackup-block-size "));
strncat(pszCmdLine, netbackupBlockSize, strlen(netbackupBlockSize));
}
formPostDataFilterCommandLine(&pszCmdLine, post_data_filter_script, table_filter_file, change_schema_file, schema_level_file);
strncat(pszCmdLine, " | ", strlen(" | "));
strncat(pszCmdLine, psqlPg, strlen(psqlPg));
}
else
{
strcpy(pszCmdLine, catPg); /* add 'cat' command */
strcat(pszCmdLine, " ");
strcat(pszCmdLine, inputFileSpec);
formPostDataFilterCommandLine(&pszCmdLine, post_data_filter_script, table_filter_file, change_schema_file, schema_level_file);
strcat(pszCmdLine, " | ");
strcat(pszCmdLine, psqlPg);
}
}
}
/* Build command line for gp_restore_agent */
void
formSegmentPsqlCommandLine(char** retVal, const char* inputFileSpec, bool compUsed, const char* compProg,
const char* filter_script, const char* table_filter_file,
int role, const char* psqlPg, const char* catPg,
const char* gpNBURestorePg, const char* netbackupServiceHost, const char* netbackupBlockSize,
const char* change_schema_file, const char *schema_level_file)
{
char* pszCmdLine = *retVal;
if (compUsed)
{
if (netbackupServiceHost)
{
strncpy(pszCmdLine, gpNBURestorePg, (1 + strlen(gpNBURestorePg)));
strncat(pszCmdLine, " --netbackup-service-host ", strlen(" --netbackup-service-host "));
strncat(pszCmdLine, netbackupServiceHost, strlen(netbackupServiceHost));
strncat(pszCmdLine, " --netbackup-filename ", strlen(" --netbackup-filename "));
strncat(pszCmdLine, inputFileSpec, strlen(inputFileSpec));
if (netbackupBlockSize)
{
strncat(pszCmdLine, " --netbackup-block-size ", strlen(" --netbackup-block-size "));
strncat(pszCmdLine, netbackupBlockSize, strlen(netbackupBlockSize));
}
strncat(pszCmdLine, " | ", strlen(" | "));
strncat(pszCmdLine, compProg, strlen(compProg)); /* add compression program */
}
else
{
strcpy(pszCmdLine, catPg); /* add 'cat' command */
strcat(pszCmdLine, " ");
strcat(pszCmdLine, inputFileSpec);
strcat(pszCmdLine, " | ");
strcat(pszCmdLine, compProg);
}
}
else
{
if (netbackupServiceHost)
{
strncpy(pszCmdLine, gpNBURestorePg, (1 + strlen(gpNBURestorePg)));
strncat(pszCmdLine, " --netbackup-service-host ", strlen(" --netbackup-service-host "));
strncat(pszCmdLine, netbackupServiceHost, strlen(netbackupServiceHost));
strncat(pszCmdLine, " --netbackup-filename ", strlen(" --netbackup-filename "));
strncat(pszCmdLine, inputFileSpec, strlen(inputFileSpec));
if (netbackupBlockSize)
{
strncat(pszCmdLine, " --netbackup-block-size ", strlen(" --netbackup-block-size "));
strncat(pszCmdLine, netbackupBlockSize, strlen(netbackupBlockSize));
}
}
else
{
strcpy(pszCmdLine, catPg);
strcat(pszCmdLine, " ");
strcat(pszCmdLine, inputFileSpec);
}
}
formFilterCommandLine(&pszCmdLine, filter_script, table_filter_file, role, change_schema_file, schema_level_file);
strcat(pszCmdLine, " | ");
strcat(pszCmdLine, psqlPg);
}
/* Build command line with gprestore_filter.py and its passed through parameters */
void
formFilterCommandLine(char** retVal, const char* filter_script, const char* table_filter_file,
int role, const char* change_schema_file, const char *schema_level_file)
{
char* pszCmdLine = *retVal;
if (table_filter_file || schema_level_file)
{
strcat(pszCmdLine, " | ");
strcat(pszCmdLine, filter_script);
/* Add filter option for gprestore_filter.py to
* process schemas only (no data) on master.
*/
if (role == ROLE_MASTER)
strcat(pszCmdLine, " -m");
/* Add filter option with table file to filter specified tables. */
if (table_filter_file)
{
strcat(pszCmdLine, " -t ");
strcat(pszCmdLine, table_filter_file);
}
if (change_schema_file)
{
strcat(pszCmdLine, " -c ");
strcat(pszCmdLine, change_schema_file);
}
if (schema_level_file)
{
strcat(pszCmdLine, " -s ");
strcat(pszCmdLine, schema_level_file);
}
}
}
/* Build command line with gprestore_post_data_filter.py and its passed through parameters */
void
formPostDataFilterCommandLine(char** retVal, const char* post_data_filter_script, const char* table_filter_file,
const char* change_schema_file, const char *schema_level_file)
{
char* pszCmdLine = *retVal;
if (table_filter_file || schema_level_file)
{
strcat(pszCmdLine, " | ");
strcat(pszCmdLine, post_data_filter_script);
/* Add filter option for gprestore_post_data_filter.py to
* process schemas only (no data) on master.
*/
/* Add filter option with table file to filter specified tables. */
if (table_filter_file)
{
strcat(pszCmdLine, " -t ");
strcat(pszCmdLine, table_filter_file);
}
if (change_schema_file)
{
strcat(pszCmdLine, " -c ");
strcat(pszCmdLine, change_schema_file);
}
if (schema_level_file)
{
strcat(pszCmdLine, " -s ");
strcat(pszCmdLine, schema_level_file);
}
}
}
#ifdef USE_DDBOOST
#define NO_ERR 0
......@@ -1597,48 +1362,6 @@ initDDSystem(ddp_inst_desc_t *ddp_inst, ddp_conn_desc_t *ddp_conn, ddp_client_in
return 0;
}
void
formDDBoostPsqlCommandLine(char** retVal, bool compUsed, const char* ddboostPg, const char* compProg,
const char* ddp_file_name, const char* dd_boost_buf_size,
const char* filter_script, const char* table_filter_file,
int role, const char* psqlPg, bool postSchemaOnly,
const char* change_schema_file, const char *schema_level_file,
const char* ddboost_storage_unit)
{
char* pszCmdLine = *retVal;
strcpy(pszCmdLine, ddboostPg);
strcat(pszCmdLine, " --readFile");
strcat(pszCmdLine, " --from-file=");
strcat(pszCmdLine, ddp_file_name);
if(compUsed)
{
strcat(pszCmdLine, ".gz");
}
if (ddboost_storage_unit)
{
strcat(pszCmdLine, " --ddboost-storage-unit=");
strcat(pszCmdLine, ddboost_storage_unit);
}
strcat(pszCmdLine, " --dd_boost_buf_size=");
strcat(pszCmdLine, dd_boost_buf_size);
if(compUsed)
{
strcat(pszCmdLine, " | ");
strcat(pszCmdLine, compProg);
}
if (postSchemaOnly)
formPostDataFilterCommandLine(&pszCmdLine, filter_script, table_filter_file, change_schema_file, schema_level_file);
else
formFilterCommandLine(&pszCmdLine, filter_script, table_filter_file, role, change_schema_file, schema_level_file);
strcat(pszCmdLine, " | ");
strcat(pszCmdLine, psqlPg);
}
#endif
......@@ -1803,31 +1526,37 @@ cleanUpTable()
* The return value of this function is the data area from excapeBuf.
*/
char *
shellEscape(const char *shellArg, PQExpBuffer escapeBuf)
shellEscape(const char *shellArg, PQExpBuffer escapeBuf, bool addQuote, bool reset)
{
const char *s = shellArg;
const char escape = '\\';
const char *s = shellArg;
const char escape = '\\';
resetPQExpBuffer(escapeBuf);
if (reset)
resetPQExpBuffer(escapeBuf);
/*
* Copy the shellArg into the escapeBuf prepending any characters
* requiring an escape with the escape character.
*/
while (*s != '\0')
{
switch (*s)
{
case '"':
case '$':
case '\\':
case '`':
case '!':
appendPQExpBufferChar(escapeBuf, escape);
}
appendPQExpBufferChar(escapeBuf, *s);
s++;
}
if (addQuote)
appendPQExpBufferChar(escapeBuf, '\"');
/*
* Copy the shellArg into the escapeBuf prepending any characters
* requiring an escape with the escape character.
*/
while (*s != '\0')
{
switch (*s)
{
case '"':
case '$':
case '\\':
case '`':
case '!':
appendPQExpBufferChar(escapeBuf, escape);
}
appendPQExpBufferChar(escapeBuf, *s);
s++;
}
if (addQuote)
appendPQExpBufferChar(escapeBuf, '\"');
return escapeBuf->data;
return escapeBuf->data;
}
src/bin/pg_dump/cdb/cdb_dump_util.h
浏览文件 @ 696a3080
......@@ -162,31 +162,6 @@ extern char *DataToBase64(const char *pszIn, unsigned int InLen);
extern char *Base64ToData(const char *pszIn, unsigned int *pOutLen);
extern char *nextToken(register char **stringp, register const char *delim);
extern int parseDbidSet(int *dbidset, char *dump_set);
extern char* formCompressionProgramString(char* compPg);
extern void formDDBoostPsqlCommandLine(char** retVal, bool compUsed, const char* ddboostPg, const char* compProg,
const char* ddp_file_name, const char* dd_boost_buf_size,
const char* filter_script, const char* table_filter_file,
int role, const char* psqlPg, bool postSchemaOnly,
const char* change_schema_file, const char *schema_level_file,
const char* ddboost_storage_unit);
extern void formSegmentPsqlCommandLine(char** retVal, const char* inputFileSpec,
bool compUsed, const char* compProg, const char* filter_script,
const char* table_filter_file, int role, const char* psqlPg, const char* catPg,
const char* gpNBURestorePg, const char* netbackupServiceHost, const char* netbackupBlockSize,
const char* change_schema, const char* schema_level_file);
extern void formPostDataSchemaOnlyPsqlCommandLine(char** retVal, const char* inputFileSpec,
bool compUsed, const char* compProg, const char* post_data_filter_script,
const char* table_filter_file, const char* psqlPg, const char* catPg,
const char* gpNBURestorePg, const char* netbackupServiceHost, const char* netbackupBlockSize,
const char* change_schema_file, const char *schema_level_file);
extern void formFilterCommandLine(char** retVal, const char* filter_script, const char* table_filter_file,
int role, const char* change_schema_file, const char *schema_level_file);
extern void formPostDataFilterCommandLine(char** retVal, const char* post_data_filter_script, const char* table_filter_file,
const char* change_schema_file, const char *schema_level_file);
/* prototypes for hash table */
......@@ -202,5 +177,5 @@ char getTypstorage(Oid o);
int removeNode(Oid o);
extern char* shellEscape(const char *shellArg, PQExpBuffer escapeBuf);
extern char *shellEscape(const char *shellArg, PQExpBuffer escapeBuf, bool addQuote, bool reset);
#endif /* CDB_DUMP_UTIL_H */
src/bin/pg_dump/cdb/cdb_restore.c
浏览文件 @ 696a3080
......@@ -1837,9 +1837,9 @@ addPassThroughLongParm(const char *Parm, const char *pszValue, char *pszPassThro
PQExpBuffer valueBuf = createPQExpBuffer();
if (bFirstTime)
pszRtn = MakeString("--%s \"%s\"", Parm, shellEscape(pszValue, valueBuf));
pszRtn = MakeString("--%s \"%s\"", Parm, shellEscape(pszValue, valueBuf, false, false));
else
pszRtn = MakeString("%s --%s \"%s\"", pszPassThroughParmString, Parm, shellEscape(pszValue, valueBuf));
pszRtn = MakeString("%s --%s \"%s\"", pszPassThroughParmString, Parm, shellEscape(pszValue, valueBuf, false, false));
destroyPQExpBuffer(valueBuf);
}
......
src/bin/pg_dump/cdb/cdb_restore_agent.c
浏览文件 @ 696a3080
......@@ -72,6 +72,14 @@ int optreset;
#ifdef USE_DDBOOST
#include "ddp_api.h"
static void formDDBoostPsqlCommandLine(PQExpBuffer buf, const char *argv0,
bool post_data, int role,
const char *compProg, const char *ddp_file_name,
const char *dd_boost_buf_size,
const char *table_filter_file,
const char *change_schema_file,
const char *schema_level_file,
const char *ddboost_storage_unit);
static char *formDDBoostFileName(char *pszBackupKey, bool isPostData, char *ddBoostDir);
static int cleanupDDSystem(void);
......@@ -85,15 +93,9 @@ static char *DEFAULT_BACKUP_DIRECTORY = NULL;
char *log_message_path = NULL;
static int dd_boost_enabled = 0;
static char *dd_boost_buf_size = NULL;
static char *ddboostPg = NULL;
static char *ddboost_storage_unit = NULL;
#endif
#ifndef PATH_NAME_MAX
#define PATH_NAME_MAX 1024
#endif
#define DUMP_PREFIX (dump_prefix==NULL?"":dump_prefix)
static void usage(const char *progname);
......@@ -107,12 +109,23 @@ static void psqlHandler(int signo);
static void myHandler(int signo);
static void *monitorThreadProc(void *arg __attribute__((unused)));
static void _check_database_version(ArchiveHandle *AH);
static char *testProgramExists(char *pszProgramName);
static void formPsqlCommandLine(PQExpBuffer buf, const char *argv0, bool post_data, int role,
const char *inputFileSpec,
const char *compProg, const char *table_filter_file,
const char *netbackupServiceHost,
const char *netbackupBlockSize,
const char *change_schema_file,
const char *schema_level_file);
static void formFilterCommandLine(PQExpBuffer buf, const char *argv0,
bool post_data, int role,
const char *table_filter_file,
const char *change_schema_file,
const char *schema_level_file);
static bool bUsePSQL = false;
static volatile sig_atomic_t bPSQLDone = false;
static volatile sig_atomic_t bKillPsql = false;
static bool bCompUsed = false; /* de-compression is used */
static char *g_compPg = NULL; /* de-compression program with full path */
static char *g_gpdumpInfo = NULL;
static char *g_gpdumpKey = NULL;
......@@ -139,7 +152,6 @@ char *g_LastMsg = NULL;
int g_role = ROLE_MASTER; /* would change to ROLE_MASTER when
* necessary */
static const unsigned long MAX_COMMANDLINE_LEN = 1000000;
static char * table_filter_file = NULL;
static char * dump_prefix = NULL;
/* end cdb additions */
......@@ -170,10 +182,9 @@ main(int argc, char **argv)
StatusOp *pOp;
struct sigaction act;
pid_t newpid;
char *pszOnErrorStop = "-v ON_ERROR_STOP=";
/* int i; */
char *pszCmdLine;
PQExpBuffer pszCmdLine;
int status;
int rc;
char *pszErrorMsg;
......@@ -413,8 +424,6 @@ main(int argc, char **argv)
break;
case 4: /* gp-c */
g_compPg = strdup(optarg);
bCompUsed = true; /* backup data is coming from stdin
* (piped from gunzip) */
break;
case 5: /* target-dbid */
g_targetDBID = atoi(strdup(optarg));
......@@ -706,60 +715,6 @@ main(int argc, char **argv)
}
else if (newpid == 0)
{
char *psqlPg = NULL;
char *filterScript = NULL;
char *postDataFilterScript = NULL;
char *catPg = NULL;
char *gpNBURestorePg = NULL;
pszOnErrorStop = "-v ON_ERROR_STOP=";
/* Child Process */
/* launch psql, wait for it to finish */
/* find psql in PATH or PGPATH */
if ((psqlPg = testProgramExists("psql")) == NULL)
{
mpp_err_msg(logError, progname, "psql not found in path");
exit(1);
}
if ((filterScript = testProgramExists("gprestore_filter.py")) == NULL)
{
mpp_err_msg(logError, progname, "Restore filter script not found in path");
exit(1);
}
if ((postDataFilterScript = testProgramExists("gprestore_post_data_filter.py")) == NULL)
{
mpp_err_msg(logError, progname, "Restore post data filter script not found in path");
exit(1);
}
if ((catPg = testProgramExists("cat")) == NULL)
{
mpp_err_msg(logError, progname, "cat program not found in path");
exit(1);
}
if ((gpNBURestorePg = testProgramExists("gp_bsa_restore_agent")) == NULL)
{
mpp_err_msg(logError, progname, "NetBackup restore agent \"gp_bsa_restore_agent\" not found in path");
exit(1);
}
if (bCompUsed)
{
g_compPg = formCompressionProgramString(g_compPg);
if (!g_compPg)
{
mpp_err_msg(logError, progname, "Could not allocate memory %s:%d", __FILE__, __LINE__);
exit(1);
}
}
/* backup file name */
/* TODO: use findAcceptableBackupFilePathName(...) to look for the file name
* if user invoked gp_restore_agent directly without supplying a file name.
* If the agent is invoked from gp_restore_launch, then we are ok.
......@@ -769,8 +724,7 @@ main(int argc, char **argv)
char *rawInputFile = argv[optind];
valueBuf = createPQExpBuffer();
inputFileSpec = shellEscape(rawInputFile, valueBuf);
inputFileSpec = shellEscape(rawInputFile, valueBuf, false, false);
}
if (inputFileSpec == NULL || inputFileSpec[0] == '\0')
......@@ -791,86 +745,42 @@ main(int argc, char **argv)
}
}
#ifdef USE_DDBOOST
/* find if gpddboost is present in PATH or PGPATH */
if ((ddboostPg = testProgramExists("gpddboost")) == NULL)
{
mpp_err_msg(logError, progname, "gpddboost not found in path\n");
}
#endif
/* add all the psql args to the command string */
/* Its too error prone to pre-calc the exact command line length
just allocate a chunk of memory that is not likely to be exceeded. */
pszCmdLine = (char *) calloc(MAX_COMMANDLINE_LEN, 1);
pszCmdLine = createPQExpBuffer();
#ifdef USE_DDBOOST
if (dd_boost_enabled)
{
formDDBoostPsqlCommandLine(&pszCmdLine, bCompUsed, ddboostPg, g_compPg,
ddp_file_name, dd_boost_buf_size,
postDataSchemaOnly? postDataFilterScript : filterScript,
table_filter_file,
g_role, psqlPg,
postDataSchemaOnly,
change_schema_file,
schema_level_file,
ddboost_storage_unit);
formDDBoostPsqlCommandLine(pszCmdLine, argv[0],
(postDataSchemaOnly == 1 ? true : false),
g_role, g_compPg, ddp_file_name,
dd_boost_buf_size, table_filter_file,
change_schema_file, schema_level_file,
ddboost_storage_unit);
}
else
{
#endif
if(postDataSchemaOnly)
{
formPostDataSchemaOnlyPsqlCommandLine(&pszCmdLine, inputFileSpec, bCompUsed, g_compPg,
postDataFilterScript, table_filter_file, psqlPg, catPg,
gpNBURestorePg, netbackup_service_host, netbackup_block_size,
change_schema_file, schema_level_file);
}
else
{
/* Non ddboost restore */
formSegmentPsqlCommandLine(&pszCmdLine, inputFileSpec, bCompUsed, g_compPg,
filterScript, table_filter_file,
g_role, psqlPg, catPg,
gpNBURestorePg, netbackup_service_host, netbackup_block_size,
change_schema_file, schema_level_file);
}
formPsqlCommandLine(pszCmdLine, argv[0], (postDataSchemaOnly == 1), g_role,
inputFileSpec, g_compPg, table_filter_file,
netbackup_service_host, netbackup_block_size,
change_schema_file, schema_level_file);
#ifdef USE_DDBOOST
}
#endif
strcat(pszCmdLine, " -h ");
strcat(pszCmdLine, g_targetHost);
strcat(pszCmdLine, " -p ");
strcat(pszCmdLine, g_targetPort);
strcat(pszCmdLine, " -U ");
strcat(pszCmdLine, SegDB.pszDBUser);
strcat(pszCmdLine, " -d ");
// Shell escape DBName for command line
SegDB.pszDBName = shellEscape(SegDB.pszDBName, escapeBuf);
// quote the DBName in case of any funy chars
char *quotedDBName = MakeString("\"%s\"", SegDB.pszDBName);
free(SegDB.pszDBName);
SegDB.pszDBName = quotedDBName;
strcat(pszCmdLine, SegDB.pszDBName);
strcat(pszCmdLine, " -a ");
appendPQExpBuffer(pszCmdLine, " -h %s -p %s -U %s -d ",
g_targetHost, g_targetPort, SegDB.pszDBUser);
shellEscape(SegDB.pszDBName, pszCmdLine, true /* quote */, false /* reset */);
appendPQExpBuffer(pszCmdLine, " -a ");
if (g_bOnErrorStop)
{
strcat(pszCmdLine, " ");
strcat(pszCmdLine, pszOnErrorStop);
}
appendPQExpBuffer(pszCmdLine, " -v ON_ERROR_STOP=");
if (g_role == ROLE_SEGDB)
putenv("PGOPTIONS=-c gp_session_role=UTILITY");
if (g_role == ROLE_MASTER)
putenv("PGOPTIONS=-c gp_session_role=DISPATCH");
mpp_err_msg(logInfo, progname, "Command Line: %s\n", pszCmdLine);
mpp_err_msg(logInfo, progname, "Command Line: %s\n", pszCmdLine->data);
/*
* Make this new process the process group leader of the children
......@@ -879,10 +789,10 @@ main(int argc, char **argv)
*/
setpgid(newpid, newpid);
execl("/bin/sh", "sh", "-c", pszCmdLine, NULL);
execl("/bin/sh", "sh", "-c", pszCmdLine->data, NULL);
mpp_err_msg(logInfo, progname, "Error in gp_restore_agent - execl of %s with Command Line %s failed",
"/bin/sh", pszCmdLine);
"/bin/sh", pszCmdLine->data);
_exit(127);
}
......@@ -1373,142 +1283,138 @@ _check_database_version(ArchiveHandle *AH)
}
}
/* testProgramExists(char* pszProgramName) returns bool
* This runs a shell with which pszProgramName > tempfile
* piping the output to a temp file.
* If the file is empty, then pszProgramName didn't exist
* on the path.
*/
static char *
testProgramExists(char *pszProgramName)
/* Build command line for gp_restore_agent */
static void
formPsqlCommandLine(PQExpBuffer buf, const char *argv0, bool post_data, int role,
const char *inputFileSpec,
const char *compProg, const char *table_filter_file,
const char *netbackupServiceHost,
const char *netbackupBlockSize,
const char *change_schema_file,
const char *schema_level_file)
{
char *pszProgramNameLocal;
char *p;
/* Now see what the length of the file is - 0 means not there */
struct stat buf;
char *pszEnvPath;
char *pszPath;
char *pColon;
char *pColonNext;
char *pszTestPath;
char gpNBURestorePg[MAXPGPATH] = {'\0'};
char psqlPg[MAXPGPATH] = {'\0'};
if (pszProgramName == NULL || *pszProgramName == '\0')
return NULL;
/*
* The pszProgramName might have command line arguments, so we need to
* stop at the first whitespace
*/
pszProgramNameLocal = malloc(strlen(pszProgramName) + 1);
if (pszProgramNameLocal == NULL)
if (find_other_exec(argv0, "psql", NULL, psqlPg) < 0)
{
mpp_err_msg(logError, progname, "out of memory");
mpp_err_msg(logError, progname, "psql not found in path");
exit(1);
}
strcpy(pszProgramNameLocal, pszProgramName);
p = pszProgramNameLocal;
while (*p != '\0')
if (netbackupServiceHost)
{
if (*p == ' ' || *p == '\t' || *p == '\n')
break;
if (find_other_exec(argv0, "gp_bsa_restore_agent", NULL, gpNBURestorePg) < 0)
{
mpp_err_msg(logError, progname, "NetBackup restore agent \"gp_bsa_restore_agent\" not found in path");
exit(1);
}
p++;
appendPQExpBuffer(buf, " %s --netbackup-service-host %s --netbackup-filename %s ",
gpNBURestorePg, netbackupServiceHost, inputFileSpec);
if (netbackupBlockSize)
appendPQExpBuffer(buf, " --netbackup-block-size %s ", netbackupBlockSize);
}
else
appendPQExpBuffer(buf, " cat %s ", inputFileSpec);
if (compProg)
appendPQExpBuffer(buf, " | %s -c ", compProg);
formFilterCommandLine(buf, argv0, post_data, role, table_filter_file, change_schema_file, schema_level_file);
appendPQExpBuffer(buf, " | %s ", psqlPg);
}
/* Build command line with gprestore_filter.py or gprestore_post_data_filter.py and its passed through parameters */
static void
formFilterCommandLine(PQExpBuffer buf, const char *argv0,
bool post_data, int role,
const char *table_filter_file,
const char *change_schema_file,
const char *schema_level_file)
{
char filterScript[MAXPGPATH] = {'\0'};
*p = '\0';
if (!table_filter_file && !schema_level_file)
return;
pszEnvPath = getenv("PGPATH");
if (pszEnvPath != NULL)
if (post_data)
{
pszTestPath = (char *) malloc(strlen(pszEnvPath) + 1 + strlen(pszProgramNameLocal) + 1);
if (pszTestPath == NULL)
if (find_other_exec(argv0, "gprestore_post_data_filter.py", NULL, filterScript) < 0)
{
mpp_err_msg(logError, progname, "out of memory in testProgramExists");
mpp_err_msg(logError, progname, "Restore post data filter script not found in path");
exit(1);
}
sprintf(pszTestPath, "%s/%s", pszEnvPath, pszProgramNameLocal);
if (stat(pszTestPath, &buf) >= 0)
return pszTestPath;
}
pszEnvPath = getenv("PATH");
if (pszEnvPath == NULL)
return NULL;
pszPath = (char *) malloc(strlen(pszEnvPath) + 1);
if (pszPath == NULL)
else
{
mpp_err_msg(logError, progname, "out of memory in testProgramExists");
if (find_other_exec(argv0, "gprestore_filter.py", NULL, filterScript) < 0)
{
mpp_err_msg(logError, progname, "Restore filter script not found in path");
exit(1);
}
}
strcpy(pszPath, pszEnvPath);
appendPQExpBuffer(buf, " | %s ", filterScript);
/* Try to create each level of the hierarchy that doesn't already exist */
pColon = pszPath;
/*
* Add filter option for gprestore_filter.py to process schemas only (no
* data) on master. This option cannot be used in conjunction with
* post_data
*/
if (role == ROLE_MASTER && !post_data)
appendPQExpBuffer(buf, " -m ");
while (pColon != NULL && *pColon != '\0')
{
/* Find next delimiter */
pColonNext = strchr(pColon, ':');
if (table_filter_file)
appendPQExpBuffer(buf, " -t %s ", table_filter_file);
if (pColonNext == pColon)
{
pColon++;
continue;
}
if (change_schema_file)
appendPQExpBuffer(buf, " -c %s ", change_schema_file);
if (pColonNext == NULL)
{
/* See whether pszProgramName exists in subdirectory pColon */
pszTestPath = (char *) malloc(strlen(pColon) + 1 + strlen(pszProgramNameLocal) + 1);
if (pszTestPath == NULL)
{
mpp_err_msg(logError, progname, "out of memory in testProgramExists");
}
if (schema_level_file)
appendPQExpBuffer(buf, " -s %s ", schema_level_file);
}
sprintf(pszTestPath, "%s/%s", pColon, pszProgramNameLocal);
if (stat(pszTestPath, &buf) >= 0)
return pszTestPath;
else
return NULL;
}
#ifdef USE_DDBOOST
/* Temporarily end the string at the : we just found. */
*pColonNext = '\0';
static void
formDDBoostPsqlCommandLine(PQExpBuffer buf, const char *argv0,
bool post_data, int role,
const char *compProg, const char *ddp_file_name,
const char *dd_boost_buf_size,
const char *table_filter_file,
const char *change_schema_file,
const char *schema_level_file,
const char *ddboost_storage_unit)
{
static char ddboostPg[MAXPGPATH] = {'\0'};
/* See whether pszProgramName exists in subdirectory pColon */
pszTestPath = (char *) malloc(strlen(pColon) + 1 + strlen(pszProgramNameLocal) + 1);
if (pszTestPath == NULL)
{
mpp_err_msg(logError, progname, "out of memory in testProgramExists");
}
if (find_other_exec(argv0, "gpddboost", NULL, ddboostPg) < 0)
{
mpp_err_msg(logError, progname, "gpddboost not found in path\n");
exit(1);
}
sprintf(pszTestPath, "%s/%s", pColon, pszProgramNameLocal);
if (stat(pszTestPath, &buf) >= 0)
{
*pColonNext = ':';
return pszTestPath;
}
appendPQExpBuffer(buf, " %s --readFile --from-file=%s%s ",
ddboostPg, ddp_file_name, (compProg ? ".gz" : ""));
/* Put back the colon we overwrote above. */
*pColonNext = ':';
if (ddboost_storage_unit)
appendPQExpBuffer(buf, " --ddboost-storage-unit=%s ", ddboost_storage_unit);
/* Advance past the colon. */
pColon = pColonNext + 1;
appendPQExpBuffer(buf, " --dd_boost_buf_size=%s ", dd_boost_buf_size);
/* free */
free(pszTestPath);
}
if (compProg)
appendPQExpBuffer(buf, " | %s -c ", compProg);
return NULL;
formFilterCommandLine(buf, argv0, post_data, role, table_filter_file, change_schema_file, schema_level_file);
appendPQExpBuffer(buf, " | psql ");
}
#ifdef USE_DDBOOST
static char *formDDBoostFileName(char *pszBackupKey, bool isPostData, char *dd_boost_dir)
{
/* First form the prefix */
char szFileNamePrefix[1 + PATH_NAME_MAX];
char szFileNamePrefix[1 + MAXPGPATH];
int instid; /* dispatch node */
int segid;
int len = 0;
......@@ -1518,11 +1424,11 @@ static char *formDDBoostFileName(char *pszBackupKey, bool isPostData, char *dd_b
instid = g_role; /* dispatch node */
segid = g_sourceDBID;
memset(szFileNamePrefix, 0, (1+PATH_NAME_MAX));
memset(szFileNamePrefix, 0, (1 + MAXPGPATH));
if (dd_boost_dir)
snprintf(szFileNamePrefix, 1 + PATH_NAME_MAX, "%s/%sgp_dump_%d_%d_", dd_boost_dir, DUMP_PREFIX, instid, segid);
snprintf(szFileNamePrefix, 1 + MAXPGPATH, "%s/%sgp_dump_%d_%d_", dd_boost_dir, DUMP_PREFIX, instid, segid);
else
snprintf(szFileNamePrefix, 1 + PATH_NAME_MAX, "%s/%sgp_dump_%d_%d_", dir_name, DUMP_PREFIX, instid, segid);
snprintf(szFileNamePrefix, 1 + MAXPGPATH, "%s/%sgp_dump_%d_%d_", dir_name, DUMP_PREFIX, instid, segid);
/* Now add up the length of the pieces */
len += strlen(szFileNamePrefix);
......@@ -1530,7 +1436,7 @@ static char *formDDBoostFileName(char *pszBackupKey, bool isPostData, char *dd_b
if (isPostData)
len += strlen("_post_data");
if (len > PATH_NAME_MAX)
if (len > MAXPGPATH)
{
mpp_err_msg(logInfo, progname, "Length > MAX for filename\n");
return NULL;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或