From 17ebee3186d1bfdee9a2b355cb8f139492d144e8 Mon Sep 17 00:00:00 2001 From: David Capwell Date: Fri, 13 Nov 2020 11:18:55 -0800 Subject: [PATCH] CASSANDRA-15158 fixed SCHEMA_DELAY to use getSchemaDelay and no longer convert it from secones to millis (since its already millis) patch by David Capwell; reviewed by Blake Eggleston for CASSANDRA-15158 --- src/java/org/apache/cassandra/service/StorageService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index 3718e8caf5..a72b530c8e 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -113,7 +113,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE private static final Logger logger = LoggerFactory.getLogger(StorageService.class); public static final int RING_DELAY = getRingDelay(); // delay after which we assume ring has stablized - public static final int SCHEMA_DELAY = getRingDelay(); // delay after which we assume ring has stablized + public static final int SCHEMA_DELAY_MILLIS = getSchemaDelay(); private static final boolean REQUIRE_SCHEMAS = !Boolean.getBoolean("cassandra.skip_schema_check"); @@ -873,7 +873,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS); } - boolean schemasReceived = MigrationCoordinator.instance.awaitSchemaRequests(TimeUnit.SECONDS.toMillis(SCHEMA_DELAY)); + boolean schemasReceived = MigrationCoordinator.instance.awaitSchemaRequests(SCHEMA_DELAY_MILLIS); if (schemasReceived) return;