Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F2B6010BFC for ; Mon, 22 Dec 2014 19:35:27 +0000 (UTC) Received: (qmail 80854 invoked by uid 500); 22 Dec 2014 19:35:27 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 80808 invoked by uid 500); 22 Dec 2014 19:35:27 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 80794 invoked by uid 99); 22 Dec 2014 19:35:27 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Dec 2014 19:35:27 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7E5F5A3352E; Mon, 22 Dec 2014 19:35:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Mon, 22 Dec 2014 19:35:27 -0000 Message-Id: <05a6b72b2da14502b17476041ce3be6d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] accumulo git commit: ACCUMULO-3441 use the proper TServerStatus object to update current instances Repository: accumulo Updated Branches: refs/heads/1.6 c5427e13a -> 62868b8e0 ACCUMULO-3441 use the proper TServerStatus object to update current instances Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/00d758d1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/00d758d1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/00d758d1 Branch: refs/heads/1.6 Commit: 00d758d17aa380bf42a69bf2795aead6eced9a22 Parents: b6f9a1e Author: Eric C. Newton Authored: Mon Dec 22 14:34:32 2014 -0500 Committer: Eric C. Newton Committed: Mon Dec 22 14:34:32 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/server/master/LiveTServerSet.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/00d758d1/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java index 002389a..16f9885 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java +++ b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java @@ -308,7 +308,8 @@ public class LiveTServerSet implements Watcher { updates.add(instance); TServerInfo tServerInfo = new TServerInfo(instance, new TServerConnection(client)); current.put(zPath, tServerInfo); - currentInstances.put(info.instance, tServerInfo); + currentInstances.remove(info.instance); + currentInstances.put(instance, tServerInfo); } } }