Skip to content

Commit 1eb170c

Browse files
committed
[PLAT-18442] Disable DDL atomicity check if YSQL is not enabled for the universe
Summary: Right now we'll attempt to perform DDL atomicity check on the universe even if it's YCQL only unvierse. And the check fails in above case, obviously. This diff fixes that by disabling the check in case YSQL is not enabled. Test Plan: Create YCQL only universe Make sure all health checks are successful. Reviewers: skurapati Reviewed By: skurapati Subscribers: yugaware Differential Revision: https://phorge.dev.yugabyte.com/D46588
1 parent 812b724 commit 1eb170c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

managed/src/main/java/com/yugabyte/yw/commissioner/HealthChecker.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,16 +1030,16 @@ private List<NodeData> checkNodes(CheckSingleUniverseParams params, List<NodeInf
10301030
String nodeToRunDdlAtomicityCheck = null;
10311031
String masterLeaderUrl = null;
10321032

1033-
if (ddlAtomicityCheckEnabled) {
1033+
UserIntent userIntent = universe.getUniverseDetails().getPrimaryCluster().userIntent;
1034+
if (ddlAtomicityCheckEnabled && userIntent.enableYSQL) {
10341035
int ddlAtomicityIntervalSec =
10351036
confGetter.getConfForScope(universe, UniverseConfKeys.ddlAtomicityIntervalSec);
10361037
nodeCheckTimeoutSec =
10371038
confGetter.getConfForScope(universe, UniverseConfKeys.nodeCheckTimeoutDdlSec);
10381039

10391040
Instant lastDdlAtomicitySuccessfulCheckTimestamp =
10401041
ddlAtomicitySuccessfulCheckTimestamp.get(universe.getUniverseUUID());
1041-
String ybDbRelease =
1042-
universe.getUniverseDetails().getPrimaryCluster().userIntent.ybSoftwareVersion;
1042+
String ybDbRelease = userIntent.ybSoftwareVersion;
10431043
boolean ddlAtomicityCheckSupported =
10441044
CommonUtils.isReleaseBetween(DDL_ATOMICITY_CHECK_RELEASE, "2.19.0.0-b0", ybDbRelease)
10451045
|| CommonUtils.isReleaseEqualOrAfter(

0 commit comments

Comments
 (0)