Merge branch 'elasticity' into 4246-fate-create-retry

core/src/main/java/org/apache/accumulo/core/conf/Property.java

@@ -1457,7 +1457,8 @@ public static boolean isValidTablePropertyKey(String key) {
       COMPACTOR_MINTHREADS_TIMEOUT,
 
       // others
-      TSERV_NATIVEMAP_ENABLED, TSERV_SCAN_MAX_OPENFILES, MANAGER_RECOVERY_WAL_EXISTENCE_CACHE_TIME);
+      TSERV_NATIVEMAP_ENABLED, TSERV_SCAN_MAX_OPENFILES, MANAGER_RECOVERY_WAL_EXISTENCE_CACHE_TIME,
+      TSERV_SESSION_MAXIDLE, TSERV_UPDATE_SESSION_MAXIDLE);
 
   /**
    * Checks if the given property may be changed via Zookeeper, but not recognized until the restart

core/src/test/java/org/apache/accumulo/core/util/TimerTest.java

@@ -65,8 +65,6 @@ public void testHasElapsed() throws InterruptedException {
 
     assertTrue(timer.hasElapsed(Duration.ofMillis(50)),
         "The timer should indicate that 50 milliseconds have elapsed.");
-    assertFalse(timer.hasElapsed(Duration.ofMillis(100)),
-        "The timer should not indicate that 100 milliseconds have elapsed.");
   }
 
   @Test
@@ -77,33 +75,25 @@ public void testHasElapsedWithTimeUnit() throws InterruptedException {
 
     assertTrue(timer.hasElapsed(50, MILLISECONDS),
         "The timer should indicate that 50 milliseconds have elapsed.");
-    assertFalse(timer.hasElapsed(100, MILLISECONDS),
-        "The timer should not indicate that 100 milliseconds have elapsed.");
   }
 
   @Test
-  public void testElapsedPrecision() throws InterruptedException {
+  public void testElapsedWithTimeUnit() throws InterruptedException {
     Timer timer = Timer.startNew();
 
     final int sleepMillis = 50;
     Thread.sleep(sleepMillis);
 
     long elapsedMillis = timer.elapsed(MILLISECONDS);
-    assertEquals(sleepMillis, elapsedMillis, 5, "Elapsed time in milliseconds is not accurate.");
-  }
-
-  @Test
-  public void testElapsedWithTimeUnit() throws InterruptedException {
-    Timer timer = Timer.startNew();
 
-    Thread.sleep(50);
+    assertTrue(elapsedMillis >= sleepMillis, "Elapsed time in milliseconds is not correct.");
 
-    long elapsedMillis = timer.elapsed(MILLISECONDS);
-    assertEquals(50, elapsedMillis, 5, "Elapsed time in milliseconds is not accurate.");
+    if (elapsedMillis < 1000) {
+      long elapsedSeconds = timer.elapsed(TimeUnit.SECONDS);
+      assertEquals(0, elapsedSeconds,
+          "Elapsed time in seconds should be 0 for 50 milliseconds of sleep.");
+    }
 
-    long elapsedSeconds = timer.elapsed(TimeUnit.SECONDS);
-    assertEquals(0, elapsedSeconds,
-        "Elapsed time in seconds should be 0 for 50 milliseconds of sleep.");
   }
 
 }