[accumulo] branch main updated: Update Last Location. Fix #1169 (#1616)

[ct...@apache.org]

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

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/main by this push:
     new 1c0f8df  Update Last Location. Fix #1169  (#1616)
1c0f8df is described below

commit 1c0f8df4ebf7ecb75cde889b32fcdbcfeaf4689d
Author: Jeffrey Manno <je...@gmail.com>
AuthorDate: Tue Sep 1 11:26:15 2020 -0400

    Update Last Location. Fix #1169  (#1616)
---
 .../java/org/apache/accumulo/server/master/state/MetaDataStateStore.java | 1 +
 .../java/org/apache/accumulo/test/functional/MasterAssignmentIT.java     | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataStateStore.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataStateStore.java
index 6adef3d..dfbb598 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataStateStore.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataStateStore.java
@@ -66,6 +66,7 @@ class MetaDataStateStore implements TabletStateStore {
       for (Assignment assignment : assignments) {
         Mutation m = new Mutation(assignment.tablet.getMetadataEntry());
         assignment.server.putLocation(m);
+        assignment.server.putLastLocation(m);
         assignment.server.clearFutureLocation(m);
         SuspendingTServer.clearSuspension(m);
         writer.addMutation(m);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java
index 69601c4..ec4b46c 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java
@@ -56,7 +56,6 @@ public class MasterAssignmentIT extends AccumuloClusterHarness {
         UtilWaitThread.sleep(250);
         newTablet = getTabletLocationState(c, tableId);
       } while (newTablet.current == null);
-      assertNull(newTablet.last);
       assertNull(newTablet.future);
 
       // put something in it