Commit00a7c90

committed

In pg_upgrade, don't copy visibility map files from clusters that did not

have crash-safe visibility maps to clusters that expect crash-safety.Request from Robert Haas.

1 parentffaf9ec commit00a7c90Copy full SHA for 00a7c90

File tree

+22

-2

lines changed

+22

-2

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,12 @@`
`64`	`64`	`#defineTABLE_SPACE_SUBDIRS_CAT_VER 201001111`
`65`	`65`	`/* postmaster/postgres -b (binary_upgrade) flag added during PG 9.1 development */`
`66`	`66`	`#defineBINARY_UPGRADE_SERVER_FLAG_CAT_VER 201104251`
	`67`	`+/*`
	`68`	`+ * Visibility map changed with this 9.2 commit,`
	`69`	`+ *8f9fe6edce358f7904e0db119416b4d1080a83aa; pick later catalog version.`
	`70`	`+ */`
	`71`	`+#defineVISIBILITY_MAP_CRASHSAFE_CAT_VER 201107031`
	`72`	`+`
`67`	`73`
`68`	`74`	`/*`
`69`	`75`	`* Each relation is represented by a relinfo structure.`

Lines changed: 16 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -120,9 +120,15 @@ transfer_single_new_db(pageCnvCtx *pageConverter,`
`120`	`120`	`intnumFiles=0;`
`121`	`121`	`intmapnum;`
`122`	`122`	`intfileno;`
`123`		`-`
	`123`	`+boolvm_crashsafe_change= false;`
	`124`	`+`
`124`	`125`	`old_dir[0]='\0';`
`125`	`126`
	`127`	`+/* Do not copy non-crashsafe vm files for binaries that assume crashsafety */`
	`128`	`+if (old_cluster.controldata.cat_ver<VISIBILITY_MAP_CRASHSAFE_CAT_VER&&`
	`129`	`+new_cluster.controldata.cat_ver >=VISIBILITY_MAP_CRASHSAFE_CAT_VER)`
	`130`	`+vm_crashsafe_change= true;`
	`131`	`+`
`126`	`132`	`for (mapnum=0;mapnum<size;mapnum++)`
`127`	`133`	`{`
`128`	`134`	`charold_file[MAXPGPATH];`
`@@ -168,8 +174,16 @@ transfer_single_new_db(pageCnvCtx *pageConverter,`
`168`	`174`
`169`	`175`	`for (fileno=0;fileno<numFiles;fileno++)`
`170`	`176`	`{`
	`177`	`+char*vm_offset=strstr(namelist[fileno]->d_name,"_vm");`
	`178`	`+boolis_vm_file= false;`
	`179`	`+`
	`180`	`+/* Is a visibility map file? (name ends with _vm) */`
	`181`	`+if (vm_offset&&strlen(vm_offset)==strlen("_vm"))`
	`182`	`+is_vm_file= true;`
	`183`	`+`
`171`	`184`	`if (strncmp(namelist[fileno]->d_name,scandir_file_pattern,`
`172`		`-strlen(scandir_file_pattern))==0)`
	`185`	`+strlen(scandir_file_pattern))==0&&`
	`186`	`+(!is_vm_file\|\| !vm_crashsafe_change))`
`173`	`187`	`{`
`174`	`188`	`snprintf(old_file,sizeof(old_file),"%s/%s",maps[mapnum].old_dir,`
`175`	`189`	`namelist[fileno]->d_name);`

Comments

(0)