hcq/openGauss-OM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix rollback failed.

Browse Source
This commit is contained in:
TotaJ
2021-12-31 16:55:47 +08:00
parent b779a380cd
commit f3f6cd800f
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
script/impl/upgrade/UpgradeImpl.py
View File

@ -2825,6 +2825,12 @@ class UpgradeImpl:
fileNameList.sort(reverse=True) fileNameList.sort(reverse=True)
else: else:
fileNameList.sort() fileNameList.sort()
if 'rollback_catalog_maindb_92_506.sql' in fileNameList:
fileNameList.remove('rollback_catalog_maindb_92_506.sql')
fileNameList.append('rollback_catalog_maindb_92_506.sql')
if 'rollback_catalog_otherdb_92_506.sql' in fileNameList:
fileNameList.remove('rollback_catalog_otherdb_92_506.sql')
fileNameList.append('rollback_catalog_otherdb_92_506.sql')
fileName = "{0}_catalog_{1}_tmp.sql".format(mode, dbType) fileName = "{0}_catalog_{1}_tmp.sql".format(mode, dbType)
self.context.logger.debug("The real file list for %s: %s" % ( self.context.logger.debug("The real file list for %s: %s" % (
dbType, fileNameList)) dbType, fileNameList))
@ -2837,6 +2843,12 @@ class UpgradeImpl:
header = ["START TRANSACTION;"] header = ["START TRANSACTION;"]
fileNameList = self.getFileNameList("check_upgrade") fileNameList = self.getFileNameList("check_upgrade")
fileNameList.sort() fileNameList.sort()
if 'rollback_catalog_maindb_92_506.sql' in fileNameList:
fileNameList.remove('rollback_catalog_maindb_92_506.sql')
fileNameList.append('rollback_catalog_maindb_92_506.sql')
if 'rollback_catalog_otherdb_92_506.sql' in fileNameList:
fileNameList.remove('rollback_catalog_otherdb_92_506.sql')
fileNameList.append('rollback_catalog_otherdb_92_506.sql')
self.context.logger.debug("The real file list for checking upgrade: " self.context.logger.debug("The real file list for checking upgrade: "
"%s" % fileNameList) "%s" % fileNameList)
self.togetherFile(header, "check_upgrade", fileNameList, self.togetherFile(header, "check_upgrade", fileNameList,