PBCKP-91 fix grammar in probackup's log messages

Author: s.fukanchik

src/archive.c

@@ -614,7 +614,7 @@ push_file_internal_uncompressed(WALSegno *wal_file, const char *pg_xlog_dir,
 			if (thread_interrupted || interrupted)
 			{
 				pg_atomic_write_u32(&wal_file->done, 1);
-				elog(ERROR, "terminated while waiting for prev file");
+				elog(ERROR, "Terminated while waiting for prev file");
 			}
 			usleep(250);
 		}
@@ -903,7 +903,7 @@ push_file_internal_gz(WALSegno *wal_file, const char *pg_xlog_dir,
 			if (thread_interrupted || interrupted)
 			{
 				pg_atomic_write_u32(&wal_file->done, 1);
-				elog(ERROR, "terminated while waiting for prev file");
+				elog(ERROR, "Terminated while waiting for prev file");
 			}
 			usleep(250);
 		}

src/backup.c

@@ -84,7 +84,7 @@ backup_stopbackup_callback(bool fatal, void *userdata)
 	 */
 	if (backup_in_progress)
 	{
-		elog(WARNING, "backup in progress, stop backup");
+		elog(WARNING, "A backup is in progress, stopping it.");
 		/* don't care about stop_lsn in case of error */
 		pg_stop_backup_send(st->conn, st->server_version, current.from_replica, exclusive_backup, NULL);
 	}
@@ -711,8 +711,9 @@ do_backup(InstanceState *instanceState, pgSetBackupParams *set_backup_params,
 	char		pretty_bytes[20];
 
 	if (!instance_config.pgdata)
-		elog(ERROR, "required parameter not specified: PGDATA "
-						 "(-D, --pgdata)");
+		elog(ERROR, "No postgres data directory specified.\n"
+			 "Please specify it either using environment variable PGDATA or\n"
+			 "command line option --pgdata (-D)");
 
 	/* Initialize PGInfonode */
 	pgNodeInit(&nodeInfo);
@@ -936,12 +937,12 @@ check_server_version(PGconn *conn, PGNodeInfo *nodeInfo)
 
 	if (nodeInfo->server_version < 90500)
 		elog(ERROR,
-			 "server version is %s, must be %s or higher",
+			 "Server version is %s, must be %s or higher",
 			 nodeInfo->server_version_str, "9.5");
 
 	if (current.from_replica && nodeInfo->server_version < 90600)
 		elog(ERROR,
-			 "server version is %s, must be %s or higher for backup from replica",
+			 "Server version is %s, must be %s or higher for backup from replica",
 			 nodeInfo->server_version_str, "9.6");
 
 	if (nodeInfo->pgpro_support)
@@ -1050,7 +1051,7 @@ confirm_block_size(PGconn *conn, const char *name, int blcksz)
 
 	res = pgut_execute(conn, "SELECT pg_catalog.current_setting($1)", 1, &name);
 	if (PQntuples(res) != 1 || PQnfields(res) != 1)
-		elog(ERROR, "cannot get %s: %s", name, PQerrorMessage(conn));
+		elog(ERROR, "Cannot get %s: %s", name, PQerrorMessage(conn));
 
 	block_size = strtol(PQgetvalue(res, 0, 0), &endp, 10);
 	if ((endp && *endp) || block_size != blcksz)
@@ -1439,7 +1440,7 @@ wait_wal_lsn(const char *wal_segment_dir, XLogRecPtr target_lsn, bool is_start_l
 		}
 
 		if (!current.stream && is_start_lsn && try_count == 30)
-			elog(WARNING, "By default pg_probackup assume WAL delivery method to be ARCHIVE. "
+			elog(WARNING, "By default pg_probackup assumes that WAL delivery method to be ARCHIVE. "
 				 "If continuous archiving is not set up, use '--stream' option to make autonomous backup. "
 				 "Otherwise check that continuous archiving works correctly.");
 
@@ -1775,9 +1776,9 @@ pg_stop_backup_consume(PGconn *conn, int server_version,
 			{
 				pgut_cancel(conn);
 #if PG_VERSION_NUM >= 150000
-				elog(ERROR, "interrupted during waiting for pg_backup_stop");
+				elog(ERROR, "Interrupted during waiting for pg_backup_stop");
 #else
-				elog(ERROR, "interrupted during waiting for pg_stop_backup");
+				elog(ERROR, "Interrupted during waiting for pg_stop_backup");
 #endif
 			}
 
@@ -1823,7 +1824,7 @@ pg_stop_backup_consume(PGconn *conn, int server_version,
 			case PGRES_TUPLES_OK:
 				break;
 			default:
-				elog(ERROR, "query failed: %s query was: %s",
+				elog(ERROR, "Query failed: %s query was: %s",
 					 PQerrorMessage(conn), query_text);
 		}
 		backup_in_progress = false;
@@ -1834,13 +1835,13 @@ pg_stop_backup_consume(PGconn *conn, int server_version,
 	/* get&check recovery_xid */
 	if (sscanf(PQgetvalue(query_result, 0, recovery_xid_colno), XID_FMT, &result->snapshot_xid) != 1)
 		elog(ERROR,
-			 "result of txid_snapshot_xmax() is invalid: %s",
+			 "Result of txid_snapshot_xmax() is invalid: %s",
 			 PQgetvalue(query_result, 0, recovery_xid_colno));
 
 	/* get&check recovery_time */
 	if (!parse_time(PQgetvalue(query_result, 0, recovery_time_colno), &result->invocation_time, true))
 		elog(ERROR,
-			 "result of current_timestamp is invalid: %s",
+			 "Result of current_timestamp is invalid: %s",
 			 PQgetvalue(query_result, 0, recovery_time_colno));
 
 	/* get stop_backup_lsn */
@@ -1898,13 +1899,13 @@ pg_stop_backup_write_file_helper(const char *path, const char *filename, const c
 	join_path_components(full_filename, path, filename);
 	fp = fio_fopen(full_filename, PG_BINARY_W, FIO_BACKUP_HOST);
 	if (fp == NULL)
-		elog(ERROR, "can't open %s file \"%s\": %s",
+		elog(ERROR, "Can't open %s file \"%s\": %s",
 			 error_msg_filename, full_filename, strerror(errno));
 
 	if (fio_fwrite(fp, data, len) != len ||
 		fio_fflush(fp) != 0 ||
 		fio_fclose(fp))
-		elog(ERROR, "can't write %s file \"%s\": %s",
+		elog(ERROR, "Can't write %s file \"%s\": %s",
 			 error_msg_filename, full_filename, strerror(errno));
 
 	/*
@@ -1943,7 +1944,7 @@ pg_stop_backup(InstanceState *instanceState, pgBackup *backup, PGconn *pg_startb
 
 	/* Remove it ? */
 	if (!backup_in_progress)
-		elog(ERROR, "backup is not in progress");
+		elog(ERROR, "Backup is not in progress");
 
 	pg_silent_client_messages(pg_startbackup_conn);
 
@@ -2098,7 +2099,7 @@ backup_files(void *arg)
 
 		/* check for interrupt */
 		if (interrupted || thread_interrupted)
-			elog(ERROR, "interrupted during backup");
+			elog(ERROR, "Interrupted during backup");
 
 		elog(progress ? INFO : LOG, "Progress: (%d/%d). Process file \"%s\"",
 			 i + 1, n_backup_files_list, file->rel_path);

src/catalog.c

@@ -1055,7 +1055,7 @@ get_backup_filelist(pgBackup *backup, bool strict)
 
 	fp = fio_open_stream(backup_filelist_path, FIO_BACKUP_HOST);
 	if (fp == NULL)
-		elog(ERROR, "cannot open \"%s\": %s", backup_filelist_path, strerror(errno));
+		elog(ERROR, "Cannot open \"%s\": %s", backup_filelist_path, strerror(errno));
 
 	/* enable stdio buffering for local file */
 	if (!fio_is_remote(FIO_BACKUP_HOST))
@@ -2841,7 +2841,7 @@ parse_backup_mode(const char *value)
 		return BACKUP_MODE_DIFF_DELTA;
 
 	/* Backup mode is invalid, so leave with an error */
-	elog(ERROR, "invalid backup-mode \"%s\"", value);
+	elog(ERROR, "Invalid backup-mode \"%s\"", value);
 	return BACKUP_MODE_INVALID;
 }
 
@@ -2876,7 +2876,7 @@ parse_compress_alg(const char *arg)
 	len = strlen(arg);
 
 	if (len == 0)
-		elog(ERROR, "compress algorithm is empty");
+		elog(ERROR, "Compress algorithm is empty");
 
 	if (pg_strncasecmp("zlib", arg, len) == 0)
 		return ZLIB_COMPRESS;
@@ -2885,7 +2885,7 @@ parse_compress_alg(const char *arg)
 	else if (pg_strncasecmp("none", arg, len) == 0)
 		return NONE_COMPRESS;
 	else
-		elog(ERROR, "invalid compress algorithm value \"%s\"", arg);
+		elog(ERROR, "Invalid compress algorithm value \"%s\"", arg);
 
 	return NOT_DEFINED_COMPRESS;
 }

src/catchup.c

@@ -184,7 +184,7 @@ catchup_preflight_checks(PGNodeInfo *source_node_info, PGconn *source_conn,
 		if (source_node_info->ptrack_version_num == 0)
 			elog(ERROR, "This PostgreSQL instance does not support ptrack");
 		else if (source_node_info->ptrack_version_num < 200)
-			elog(ERROR, "ptrack extension is too old.\n"
+			elog(ERROR, "Ptrack extension is too old.\n"
 					"Upgrade ptrack to version >= 2");
 		else if (!source_node_info->is_ptrack_enabled)
 			elog(ERROR, "Ptrack is disabled");

src/checkdb.c

@@ -145,7 +145,7 @@ check_files(void *arg)
 
 		/* check for interrupt */
 		if (interrupted || thread_interrupted)
-			elog(ERROR, "interrupted during checkdb");
+			elog(ERROR, "Interrupted during checkdb");
 
 		/* No need to check directories */
 		if (S_ISDIR(file->mode))
@@ -750,7 +750,7 @@ do_checkdb(bool need_amcheck,
 	if (!skip_block_validation)
 	{
 		if (!pgdata)
-			elog(ERROR, "required parameter not specified: PGDATA "
+			elog(ERROR, "Required parameter not specified: PGDATA "
 						 "(-D, --pgdata)");
 
 		/* get node info */

src/dir.c

@@ -182,7 +182,7 @@ pgFileNew(const char *path, const char *rel_path, bool follow_symlink,
 		/* file not found is not an error case */
 		if (errno == ENOENT)
 			return NULL;
-		elog(ERROR, "cannot stat file \"%s\": %s", path,
+		elog(ERROR, "Cannot stat file \"%s\": %s", path,
 			strerror(errno));
 	}
 
@@ -787,14 +787,14 @@ opt_path_map(ConfigOption *opt, const char *arg, TablespaceList *list,
 	for (arg_ptr = arg; *arg_ptr; arg_ptr++)
 	{
 		if (dst_ptr - dst >= MAXPGPATH)
-			elog(ERROR, "directory name too long");
+			elog(ERROR, "Directory name too long");
 
 		if (*arg_ptr == '\\' && *(arg_ptr + 1) == '=')
 			;					/* skip backslash escaping = */
 		else if (*arg_ptr == '=' && (arg_ptr == arg || *(arg_ptr - 1) != '\\'))
 		{
 			if (*cell->new_dir)
-				elog(ERROR, "multiple \"=\" signs in %s mapping\n", type);
+				elog(ERROR, "Multiple \"=\" signs in %s mapping\n", type);
 			else
 				dst = dst_ptr = cell->new_dir;
 		}
@@ -803,7 +803,7 @@ opt_path_map(ConfigOption *opt, const char *arg, TablespaceList *list,
 	}
 
 	if (!*cell->old_dir || !*cell->new_dir)
-		elog(ERROR, "invalid %s mapping format \"%s\", "
+		elog(ERROR, "Invalid %s mapping format \"%s\", "
 			 "must be \"OLDDIR=NEWDIR\"", type, arg);
 	canonicalize_path(cell->old_dir);
 	canonicalize_path(cell->new_dir);
@@ -815,11 +815,11 @@ opt_path_map(ConfigOption *opt, const char *arg, TablespaceList *list,
 	 * consistent with the new_dir check.
 	 */
 	if (!is_absolute_path(cell->old_dir))
-		elog(ERROR, "old directory is not an absolute path in %s mapping: %s\n",
+		elog(ERROR, "Old directory is not an absolute path in %s mapping: %s\n",
 			 type, cell->old_dir);
 
 	if (!is_absolute_path(cell->new_dir))
-		elog(ERROR, "new directory is not an absolute path in %s mapping: %s\n",
+		elog(ERROR, "New directory is not an absolute path in %s mapping: %s\n",
 			 type, cell->new_dir);
 
 	if (list->tail)
@@ -1046,7 +1046,7 @@ read_tablespace_map(parray *links, const char *backup_dir)
 		int         i = 0;
 
 		if (sscanf(buf, "%s %n", link_name, &n) != 1)
-			elog(ERROR, "invalid format found in \"%s\"", map_path);
+			elog(ERROR, "Invalid format found in \"%s\"", map_path);
 
 		path = buf + n;
 
@@ -1438,7 +1438,7 @@ get_control_value_str(const char *str, const char *name,
 				{
 					/* verify if value_str not exceeds value_str_size limits */
 					if (value_str - value_str_start >= value_str_size - 1) {
-						elog(ERROR, "field \"%s\" is out of range in the line %s of the file %s",
+						elog(ERROR, "Field \"%s\" is out of range in the line %s of the file %s",
 							 name, str, DATABASE_FILE_LIST);
 					}
 					*value_str = *buf;
@@ -1463,7 +1463,7 @@ get_control_value_str(const char *str, const char *name,
 
 	/* Did not find target field */
 	if (is_mandatory)
-		elog(ERROR, "field \"%s\" is not found in the line %s of the file %s",
+		elog(ERROR, "Field \"%s\" is not found in the line %s of the file %s",
 			 name, str, DATABASE_FILE_LIST);
 	return false;
 }
@@ -1490,7 +1490,7 @@ dir_is_empty(const char *path, fio_location location)
 		/* Directory in path doesn't exist */
 		if (errno == ENOENT)
 			return true;
-		elog(ERROR, "cannot open directory \"%s\": %s", path, strerror(errno));
+		elog(ERROR, "Cannot open directory \"%s\": %s", path, strerror(errno));
 	}
 
 	errno = 0;
@@ -1506,7 +1506,7 @@ dir_is_empty(const char *path, fio_location location)
 		return false;
 	}
 	if (errno)
-		elog(ERROR, "cannot read directory \"%s\": %s", path, strerror(errno));
+		elog(ERROR, "Cannot read directory \"%s\": %s", path, strerror(errno));
 
 	fio_closedir(dir);
 

src/fetch.c

@@ -92,7 +92,7 @@ fetchFile(PGconn *conn, const char *filename, size_t *filesize)
 
 	/* sanity check the result set */
 	if (PQntuples(res) != 1 || PQgetisnull(res, 0, 0))
-		elog(ERROR, "unexpected result set while fetching remote file \"%s\"",
+		elog(ERROR, "Unexpected result set while fetching remote file \"%s\"",
 			 filename);
 
 	/* Read result to local variables */

src/init.c

@@ -24,11 +24,11 @@ do_init(CatalogState *catalogState)
 	results = pg_check_dir(catalogState->catalog_path);
 
 	if (results == 4)	/* exists and not empty*/
-		elog(ERROR, "backup catalog already exist and it's not empty");
+		elog(ERROR, "The backup catalog already exists and is not empty");
 	else if (results == -1) /*trouble accessing directory*/
 	{
 		int errno_tmp = errno;
-		elog(ERROR, "cannot open backup catalog directory \"%s\": %s",
+		elog(ERROR, "Cannot open backup catalog directory \"%s\": %s",
 			catalogState->catalog_path, strerror(errno_tmp));
 	}
 
@@ -41,7 +41,7 @@ do_init(CatalogState *catalogState)
 	/* create backup catalog wal directory */
 	dir_create_dir(catalogState->wal_subdir_path, DIR_PERMISSION, false);
 
-	elog(INFO, "Backup catalog '%s' successfully inited", catalogState->catalog_path);
+	elog(INFO, "Backup catalog '%s' successfully initialized", catalogState->catalog_path);
 	return 0;
 }
 
@@ -53,8 +53,9 @@ do_add_instance(InstanceState *instanceState, InstanceConfig *instance)
 
 	/* PGDATA is always required */
 	if (instance->pgdata == NULL)
-		elog(ERROR, "Required parameter not specified: PGDATA "
-						 "(-D, --pgdata)");
+		elog(ERROR, "No postgres data directory specified.\n"
+			 "Please specify it either using environment variable PGDATA or\n"
+			 "command line option --pgdata (-D)");
 
 	/* Read system_identifier from PGDATA */
 	instance->system_identifier = get_system_identifier(instance->pgdata, FIO_DB_HOST, false);
@@ -121,6 +122,6 @@ do_add_instance(InstanceState *instanceState, InstanceConfig *instance)
 	/* pgdata was set through command line */
 	do_set_config(instanceState, true);
 
-	elog(INFO, "Instance '%s' successfully inited", instanceState->instance_name);
+	elog(INFO, "Instance '%s' successfully initialized", instanceState->instance_name);
 	return 0;
 }

src/merge.c

@@ -79,10 +79,10 @@ do_merge(InstanceState *instanceState, time_t backup_id, bool no_validate, bool
 	int			i;
 
 	if (backup_id == INVALID_BACKUP_ID)
-		elog(ERROR, "required parameter is not specified: --backup-id");
+		elog(ERROR, "Required parameter is not specified: --backup-id");
 
 	if (instanceState == NULL)
-		elog(ERROR, "required parameter is not specified: --instance");
+		elog(ERROR, "Required parameter is not specified: --instance");
 
 	elog(INFO, "Merge started");