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 DE722FCD5 for ; Tue, 16 Apr 2013 20:13:27 +0000 (UTC) Received: (qmail 98430 invoked by uid 500); 16 Apr 2013 20:13:27 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 98407 invoked by uid 500); 16 Apr 2013 20:13: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 98400 invoked by uid 99); 16 Apr 2013 20:13:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Apr 2013 20:13:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Apr 2013 20:13:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8989723888CD; Tue, 16 Apr 2013 20:13:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1468589 - in /accumulo/branches/1.4: ./ src/ src/core/ src/server/ src/server/src/ src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java Date: Tue, 16 Apr 2013 20:13:06 -0000 To: commits@accumulo.apache.org From: kturner@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130416201306.8989723888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kturner Date: Tue Apr 16 20:13:06 2013 New Revision: 1468589 URL: http://svn.apache.org/r1468589 Log: ACCUMULO-1277 made master delay deleting lockless tserver nodes in zookeeper Modified: accumulo/branches/1.4/ (props changed) accumulo/branches/1.4/src/ (props changed) accumulo/branches/1.4/src/core/ (props changed) accumulo/branches/1.4/src/server/ (props changed) accumulo/branches/1.4/src/server/src/ (props changed) accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java (props changed) Propchange: accumulo/branches/1.4/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5:r1468582 Propchange: accumulo/branches/1.4/src/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5:r1468582 Merged /accumulo/branches/1.5/src:r1468582 Propchange: accumulo/branches/1.4/src/core/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/core:r1468582 Propchange: accumulo/branches/1.4/src/server/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/server:r1468582 Propchange: accumulo/branches/1.4/src/server/src/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/server/src:r1468582 Modified: accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java?rev=1468589&r1=1468588&r2=1468589&view=diff ============================================================================== --- accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java (original) +++ accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java Tue Apr 16 20:13:06 2013 @@ -204,6 +204,7 @@ public class LiveTServerSet implements W // Map from tserver master service to server information private Map current = new HashMap(); + private Map locklessServers = new HashMap(); public LiveTServerSet(Instance instance, Listener cback) { this.cback = cback; @@ -237,6 +238,8 @@ public class LiveTServerSet implements W HashSet all = new HashSet(current.keySet()); all.addAll(getZooCache().getChildren(path)); + locklessServers.keySet().retainAll(all); + for (String server : all) { checkServer(updates, doomed, path, server); } @@ -274,8 +277,15 @@ public class LiveTServerSet implements W current.remove(server); } - deleteServerNode(path + "/" + server); + Long firstSeen = locklessServers.get(server); + if (firstSeen == null) { + locklessServers.put(server, System.currentTimeMillis()); + } else if (System.currentTimeMillis() - firstSeen > 600000) { + deleteServerNode(path + "/" + server); + locklessServers.remove(server); + } } else { + locklessServers.remove(server); ServerServices services = new ServerServices(new String(lockData)); InetSocketAddress client = services.getAddress(ServerServices.Service.TSERV_CLIENT); InetSocketAddress addr = AddressUtil.parseAddress(server, Property.TSERV_CLIENTPORT); Propchange: accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java:r1468582