node check: simplify output generation in --is-shutdown-cleanly check

This commit is contained in:
Ian Barwick
2019-02-22 10:49:06 +09:00
parent 99550b91bd
commit de70fd42dc
2 changed files with 8 additions and 19 deletions

View File

@@ -5954,7 +5954,7 @@ print_node_status(NodeStatus node_status)
case NODE_STATUS_SHUTTING_DOWN:
return "SHUTTING_DOWN";
case NODE_STATUS_DOWN:
return "DOWN";
return "SHUTDOWN";
case NODE_STATUS_UNCLEAN_SHUTDOWN:
return "UNCLEAN_SHUTDOWN";
case NODE_STATUS_REJECTED:

View File

@@ -671,25 +671,14 @@ _do_node_status_is_shutdown_cleanly(void)
log_verbose(LOG_DEBUG, "node status determined as: %s",
print_node_status(node_status));
switch (node_status)
appendPQExpBuffer(&output,
"%s", print_node_status(node_status));
if (node_status == NODE_STATUS_DOWN)
{
case NODE_STATUS_UP:
appendPQExpBufferStr(&output, "RUNNING");
break;
case NODE_STATUS_SHUTTING_DOWN:
appendPQExpBufferStr(&output, "SHUTTING_DOWN");
break;
case NODE_STATUS_DOWN:
appendPQExpBuffer(&output,
"SHUTDOWN --last-checkpoint-lsn=%X/%X",
format_lsn(checkPoint));
break;
case NODE_STATUS_UNCLEAN_SHUTDOWN:
appendPQExpBufferStr(&output, "UNCLEAN_SHUTDOWN");
break;
case NODE_STATUS_UNKNOWN:
appendPQExpBufferStr(&output, "UNKNOWN");
break;
appendPQExpBuffer(&output,
" --last-checkpoint-lsn=%X/%X",
format_lsn(checkPoint));
}
printf("%s\n", output.data);