[Automated] Merged refs/heads/k8s-sync-2024-11-19-1529-99ae3101438c7a…

…2e0ec58c6ada69f9baac534901 into target main
vertica · Nov 19, 2024 · 46d6fdd · 46d6fdd
2 parents d1712ff + 462d78e
commit 46d6fdd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/vclusterops/cluster_op.go b/vclusterops/cluster_op.go
@@ -444,11 +444,11 @@ func (op *opBase) isSkipExecute() bool {
 // hasQuorum checks if we have enough working primary nodes to maintain data integrity
 // quorumCount = (1/2 * number of primary nodes) + 1
 func (op *opBase) hasQuorum(hostCount, primaryNodeCount uint) bool {
-	quorumCount := (primaryNodeCount + 1) / 2
+	quorumCount := primaryNodeCount/2 + 1
 	if hostCount < quorumCount {
 		op.logger.PrintError("[%s] Quorum check failed: "+
 			"number of hosts with latest catalog (%d) is not "+
-			"greater than or equal to 1/2 of number of the primary nodes (%d)\n",
+			"greater than 1/2 of number of the primary nodes (%d)\n",
 			op.name, hostCount, primaryNodeCount)
 		return false
 	}

diff --git a/vclusterops/cluster_op_test.go b/vclusterops/cluster_op_test.go
@@ -26,7 +26,7 @@ func TestHasQuorum(t *testing.T) {
 
 	// positive case 1:
 	hostCount := uint(2)
-	primaryNodeCount := uint(4)
+	primaryNodeCount := uint(3)
 	succeed := op.hasQuorum(hostCount, primaryNodeCount)
 	assert.Equal(t, succeed, true)
 
@@ -53,4 +53,10 @@ func TestHasQuorum(t *testing.T) {
 	primaryNodeCount = 5
 	succeed = op.hasQuorum(hostCount, primaryNodeCount)
 	assert.Equal(t, succeed, false)
+
+	// negative case 3:
+	hostCount = 2
+	primaryNodeCount = 4
+	succeed = op.hasQuorum(hostCount, primaryNodeCount)
+	assert.Equal(t, succeed, false)
 }