Remove -f option from pg_verify_checksums

mhagander · mhagander · commit 44e2df461fa5 · 2018-04-15T13:52:48.000+02:00
This option makes no sense when the cluster checksum state cannot be
changed, and should have been removed in the revert.

Author: Daniel Gustafsson
Review: Michael Paquier
diff --git a/doc/src/sgml/ref/pg_verify_checksums.sgml b/doc/src/sgml/ref/pg_verify_checksums.sgml
@@ -52,15 +52,6 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><option>-f</option></term>
-      <listitem>
-       <para>
-        Force check even if checksums are disabled on cluster.
-       </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry>
       <term><option>-d</option></term>
       <listitem>
diff --git a/src/bin/pg_verify_checksums/pg_verify_checksums.c b/src/bin/pg_verify_checksums/pg_verify_checksums.c
@@ -42,7 +42,6 @@ usage()
 	printf(_("  %s [OPTION] [DATADIR]\n"), progname);
 	printf(_("\nOptions:\n"));
 	printf(_(" [-D] DATADIR    data directory\n"));
-	printf(_("  -f,            force check even if checksums are disabled\n"));
 	printf(_("  -r relfilenode check only relation with specified relfilenode\n"));
 	printf(_("  -d             debug output, listing all checked blocks\n"));
 	printf(_("  -V, --version  output version information, then exit\n"));
@@ -202,7 +201,6 @@ int
 main(int argc, char *argv[])
 {
 	char	   *DataDir = NULL;
-	bool		force = false;
 	int			c;
 	bool		crc_ok;
 
@@ -224,7 +222,7 @@ main(int argc, char *argv[])
 		}
 	}
 
-	while ((c = getopt(argc, argv, "D:fr:d")) != -1)
+	while ((c = getopt(argc, argv, "D:r:d")) != -1)
 	{
 		switch (c)
 		{
@@ -234,9 +232,6 @@ main(int argc, char *argv[])
 			case 'D':
 				DataDir = optarg;
 				break;
-			case 'f':
-				force = true;
-				break;
 			case 'r':
 				if (atoi(optarg) <= 0)
 				{
@@ -292,7 +287,7 @@ main(int argc, char *argv[])
 		exit(1);
 	}
 
-	if (ControlFile->data_checksum_version == 0 && !force)
+	if (ControlFile->data_checksum_version == 0)
 	{
 		fprintf(stderr, _("%s: data checksums are not enabled in cluster.\n"), progname);
 		exit(1);

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@ usage()`
`42`	`42`	`printf(_(" %s [OPTION] [DATADIR]\n"), progname);`
`43`	`43`	`printf(_("\nOptions:\n"));`
`44`	`44`	`printf(_(" [-D] DATADIR data directory\n"));`
`45`		`- printf(_(" -f, force check even if checksums are disabled\n"));`
`46`	`45`	`printf(_(" -r relfilenode check only relation with specified relfilenode\n"));`
`47`	`46`	`printf(_(" -d debug output, listing all checked blocks\n"));`
`48`	`47`	`printf(_(" -V, --version output version information, then exit\n"));`
`@@ -202,7 +201,6 @@ int`
`202`	`201`	`main(int argc, char *argv[])`
`203`	`202`	`{`
`204`	`203`	`char *DataDir = NULL;`
`205`		`- bool force = false;`
`206`	`204`	`int c;`
`207`	`205`	`bool crc_ok;`
`208`	`206`
`@@ -224,7 +222,7 @@ main(int argc, char *argv[])`
`224`	`222`	`}`
`225`	`223`	`}`
`226`	`224`
`227`		`- while ((c = getopt(argc, argv, "D:fr:d")) != -1)`
	`225`	`+ while ((c = getopt(argc, argv, "D:r:d")) != -1)`
`228`	`226`	`{`
`229`	`227`	`switch (c)`
`230`	`228`	`{`
`@@ -234,9 +232,6 @@ main(int argc, char *argv[])`
`234`	`232`	`case 'D':`
`235`	`233`	`DataDir = optarg;`
`236`	`234`	`break;`
`237`		`- case 'f':`
`238`		`- force = true;`
`239`		`- break;`
`240`	`235`	`case 'r':`
`241`	`236`	`if (atoi(optarg) <= 0)`
`242`	`237`	`{`
`@@ -292,7 +287,7 @@ main(int argc, char *argv[])`
`292`	`287`	`exit(1);`
`293`	`288`	`}`
`294`	`289`
`295`		`- if (ControlFile->data_checksum_version == 0 && !force)`
	`290`	`+ if (ControlFile->data_checksum_version == 0)`
`296`	`291`	`{`
`297`	`292`	`fprintf(stderr, _("%s: data checksums are not enabled in cluster.\n"), progname);`
`298`	`293`	`exit(1);`