[cassandra] branch cassandra-3.0 updated: CASSANDRA-15158 fixed SCHEMA_DELAY to use getSchemaDelay and no longer convert it from secones to millis (since its already millis)

[dcapwell]

This is an automated email from the ASF dual-hosted git repository.

dcapwell pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/cassandra-3.0 by this push:
     new 17ebee3  CASSANDRA-15158 fixed SCHEMA_DELAY to use getSchemaDelay and 
no longer convert it from secones to millis (since its already millis)
17ebee3 is described below

commit 17ebee3186d1bfdee9a2b355cb8f139492d144e8
Author: David Capwell <dcapw...@apache.org>
AuthorDate: Fri Nov 13 11:18:55 2020 -0800

    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 3718e8c..a72b530 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;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org