[PBCKP-236] draft, solution without macros cleanup

Ivan Lazarev · Ivan Lazarev · commit 0604cce21de6 · 2022-09-16T01:55:25.000+03:00
diff --git a/src/utils/file.c b/src/utils/file.c
@@ -281,7 +281,7 @@ fio_get_agent_version(int* protocol, char* payload_buf, size_t payload_buf_size)
 	IO_CHECK(fio_read_all(fio_stdin, &hdr, sizeof(hdr)), sizeof(hdr));
 	if (hdr.size > payload_buf_size)
 	{
-		//TODO REVIEW XXX %zu is C99 but not ANSI S standard, should we cast to unsigned long?
+		//TODO REVIEW XXX %zu is C99 but not ANSI S compatible, should we use ints, %zu is also applied at data.c:501 data.c:1638??
 		elog(ERROR, "Corrupted remote compatibility protocol: insufficient payload_buf_size=%zu", payload_buf_size);
 	}
 
@@ -3330,8 +3330,6 @@ fio_communicate(int in, int out)
 
 				IO_CHECK(fio_write_all(out, &hdr, sizeof(hdr)), sizeof(hdr));
 				IO_CHECK(fio_write_all(out, buf, payload_size), payload_size);
-				//TODO REVIEW XXX make INFO to LOG or VERBOSE
-				elog(INFO, "TODO REVIEW XXX sent agent compatibility\n %s", buf);
 				break;
 			}
 		  case FIO_STAT: /* Get information about file with specified path */
diff --git a/src/utils/remote.c b/src/utils/remote.c
@@ -277,49 +277,28 @@ static char* compatibility_params[] = {
  */
 size_t prepare_compatibility_str(char* compatibility_buf, size_t compatibility_buf_size)
 {
-	char tmp_buf[1024];
-	int size_inc = 0;
-	size_t result_size = 1;
+	size_t result_size = 0;
 	size_t compatibility_params_array_size = sizeof compatibility_params / sizeof compatibility_params[0];;
 
 	*compatibility_buf = '\0';
 	Assert(compatibility_params_array_size % 2 == 0);
 
-	//TODO !!!!
 	for (int i = 0; i < compatibility_params_array_size; i+=2)
 	{
-		size_inc = snprintf(compatibility_buf + size_inc, compatibility_buf_size,
-							"%s" COMPATIBILITY_VAL_SEPARATOR "%s" COMPATIBILITY_LINE_SEPARATOR,
-							compatibility_params[i], compatibility_params[i+1]);
-
-//		size_inc = snprintf(tmp_buf, sizeof tmp_buf,
-//							"%s" COMPATIBILITY_VAL_SEPARATOR "%s" COMPATIBILITY_LINE_SEPARATOR,
-//							compatibility_params[i], compatibility_params[i+1]);
-		if (size_inc >= sizeof tmp_buf)
-		{
-			//TODO make Assert
-			elog(ERROR, "Compatibility params from agent doesn't fit to %zu chars, %s=%s",
-				 sizeof tmp_buf - 1, compatibility_params[i], compatibility_params[i+1] );
-		}
-
-		result_size += size_inc;
-		if (result_size > compatibility_buf_size)
-		{
-			//TODO make Assert
-			elog(ERROR, "Can't fit compatibility string size %zu to buffer size %zu:\n%s\n%s",
-				 result_size, compatibility_buf_size, compatibility_buf, tmp_buf);
-		}
-		strcat(compatibility_buf, tmp_buf);
+		result_size += snprintf(compatibility_buf + result_size, compatibility_buf_size - result_size,
+								"%s" COMPATIBILITY_VAL_SEPARATOR "%s" COMPATIBILITY_LINE_SEPARATOR,
+								compatibility_params[i], compatibility_params[i+1]);
+		Assert(result_size < compatibility_buf_size);
 	}
-	return result_size;
+	return result_size + 1;
 }
 
 /*
  * Check incoming remote agent's compatibility params for equality to local ones.
  */
 void check_remote_agent_compatibility(int agent_version, char *compatibility_str, size_t compatibility_str_max_size)
 {
-	elog(LOG, "Agent version=%d", agent_version);
+	elog(LOG, "Agent version=%d\n", agent_version);
 
 	if (agent_version != AGENT_PROTOCOL_VERSION)
 	{
@@ -331,25 +310,24 @@ void check_remote_agent_compatibility(int agent_version, char *compatibility_str
 
 		elog(ERROR, "Remote agent protocol version %s does not match local program protocol version %s, "
 					"consider to upgrade pg_probackup binary",
-			agent_version_str, AGENT_PROTOCOL_VERSION_STR);
+			 agent_version_str, AGENT_PROTOCOL_VERSION_STR);
 	}
 
+	/* checking compatibility params */
 	if (strnlen(compatibility_str, compatibility_str_max_size) == compatibility_str_max_size)
 	{
 		elog(ERROR, "Corrupted remote compatibility protocol: compatibility string has no terminating \\0");
 	}
 
-	elog(LOG, "Agent compatibility params: '%s'", compatibility_str);
+	elog(LOG, "Agent compatibility params:\n%s", compatibility_str);
 
-	/* checking compatibility params */
 	{
-		char *buf[compatibility_str_max_size];
+		char buf[compatibility_str_max_size];
 
 		prepare_compatibility_str(buf, sizeof buf);
-		if(!strcmp(compatibility_str, buf))
+		if(strcmp(compatibility_str, buf))
 		{
-			elog(ERROR, "Incompatible agent params, expected %s", buf);
+			elog(ERROR, "Incompatible remote agent params, expected:\n%s", buf);
 		}
 	}
-
 }

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ fio_get_agent_version(int* protocol, char* payload_buf, size_t payload_buf_size)`
`281`	`281`	`IO_CHECK(fio_read_all(fio_stdin, &hdr, sizeof(hdr)), sizeof(hdr));`
`282`	`282`	`if (hdr.size > payload_buf_size)`
`283`	`283`	`{`
`284`		`- //TODO REVIEW XXX %zu is C99 but not ANSI S standard, should we cast to unsigned long?`
	`284`	`+ //TODO REVIEW XXX %zu is C99 but not ANSI S compatible, should we use ints, %zu is also applied at data.c:501 data.c:1638??`
`285`	`285`	`elog(ERROR, "Corrupted remote compatibility protocol: insufficient payload_buf_size=%zu", payload_buf_size);`
`286`	`286`	`}`
`287`	`287`
`@@ -3330,8 +3330,6 @@ fio_communicate(int in, int out)`
`3330`	`3330`
`3331`	`3331`	`IO_CHECK(fio_write_all(out, &hdr, sizeof(hdr)), sizeof(hdr));`
`3332`	`3332`	`IO_CHECK(fio_write_all(out, buf, payload_size), payload_size);`
`3333`		`- //TODO REVIEW XXX make INFO to LOG or VERBOSE`
`3334`		`- elog(INFO, "TODO REVIEW XXX sent agent compatibility\n %s", buf);`
`3335`	`3333`	`break;`
`3336`	`3334`	`}`
`3337`	`3335`	`case FIO_STAT: /* Get information about file with specified path */`