Recheck version from Patroni IP. (#2533)

Jan-M · web-flow · commit ae95c2db6c46 · 2024-02-29T12:12:02.000+01:00
diff --git a/pkg/cluster/majorversionupgrade.go b/pkg/cluster/majorversionupgrade.go
@@ -17,6 +17,7 @@ var VersionMap = map[string]int{
 	"13": 130000,
 	"14": 140000,
 	"15": 150000,
+	"16": 160000,
 }
 
 // IsBiggerPostgresVersion Compare two Postgres version numbers
@@ -97,6 +98,12 @@ func (c *Cluster) majorVersionUpgrade() error {
 		}
 	}
 
+	// Recheck version with newest data from Patroni
+	if c.currentMajorVersion >= desiredVersion {
+		c.logger.Infof("recheck cluster version is already up to date. current: %d, min desired: %d", c.currentMajorVersion, desiredVersion)
+		return nil
+	}
+
 	numberOfPods := len(pods)
 	if allRunning && masterPod != nil {
 		c.logger.Infof("healthy cluster ready to upgrade, current: %d desired: %d", c.currentMajorVersion, desiredVersion)

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ var VersionMap = map[string]int{`
`17`	`17`	`"13": 130000,`
`18`	`18`	`"14": 140000,`
`19`	`19`	`"15": 150000,`
	`20`	`+ "16": 160000,`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`// IsBiggerPostgresVersion Compare two Postgres version numbers`
`@@ -97,6 +98,12 @@ func (c *Cluster) majorVersionUpgrade() error {`
`97`	`98`	`}`
`98`	`99`	`}`
`99`	`100`
	`101`	`+ // Recheck version with newest data from Patroni`
	`102`	`+ if c.currentMajorVersion >= desiredVersion {`
	`103`	`+ c.logger.Infof("recheck cluster version is already up to date. current: %d, min desired: %d", c.currentMajorVersion, desiredVersion)`
	`104`	`+ return nil`
	`105`	`+ }`
	`106`	`+`
`100`	`107`	`numberOfPods := len(pods)`
`101`	`108`	`if allRunning && masterPod != nil {`
`102`	`109`	`c.logger.Infof("healthy cluster ready to upgrade, current: %d desired: %d", c.currentMajorVersion, desiredVersion)`