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 23363EE64 for ; Tue, 26 Feb 2013 20:32:44 +0000 (UTC) Received: (qmail 8696 invoked by uid 500); 26 Feb 2013 20:32:44 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 8675 invoked by uid 500); 26 Feb 2013 20:32:44 -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 8668 invoked by uid 99); 26 Feb 2013 20:32:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Feb 2013 20:32:44 +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, 26 Feb 2013 20:32:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C653523888E7; Tue, 26 Feb 2013 20:32:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1450394 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ src/ test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ Date: Tue, 26 Feb 2013 20:32:23 -0000 To: commits@accumulo.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130226203223.C653523888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ecn Date: Tue Feb 26 20:32:23 2013 New Revision: 1450394 URL: http://svn.apache.org/r1450394 Log: ACCUMULO-1115 double check for table existence and use the proper keys to pull state Modified: accumulo/trunk/ (props changed) accumulo/trunk/assemble/ (props changed) accumulo/trunk/core/ (props changed) accumulo/trunk/examples/ (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed) accumulo/trunk/server/ (props changed) accumulo/trunk/src/ (props changed) accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java Propchange: accumulo/trunk/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5:r1450393 Propchange: accumulo/trunk/assemble/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/assemble:r1450393 Propchange: accumulo/trunk/core/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/core:r1450393 Propchange: accumulo/trunk/examples/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/examples:r1450393 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1450393 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1450393 Propchange: accumulo/trunk/server/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/server:r1450393 Propchange: accumulo/trunk/src/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/src:r1450393 Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java?rev=1450394&r1=1450393&r2=1450394&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java Tue Feb 26 20:32:23 2013 @@ -110,8 +110,10 @@ public class Config extends Test { String table = parts[0]; int choice = Integer.parseInt(parts[1]); Property property = tableSettings[choice].property; - log.debug("Setting " + property.getKey() + " on " + table + " back to " + property.getDefaultValue()); - state.getConnector().tableOperations().setProperty(table, property.getKey(), property.getDefaultValue()); + if (state.getConnector().tableOperations().exists(table)) { + log.debug("Setting " + property.getKey() + " on " + table + " back to " + property.getDefaultValue()); + state.getConnector().tableOperations().setProperty(table, property.getKey(), property.getDefaultValue()); + } } state.getMap().remove(LAST_SETTING); state.getMap().remove(LAST_TABLE_SETTING); @@ -136,9 +138,9 @@ public class Config extends Test { // generate a random value long newValue = random.nextLong(setting.min, setting.max); - state.getMap().put(LAST_TABLE_SETTING, "" + choice); + state.getMap().put(LAST_TABLE_SETTING, table + "," + choice); log.debug("Setting " + setting.property.getKey() + " on table " + table + " to " + newValue); - state.getConnector().instanceOperations().setProperty(setting.property.getKey(), table + "," + newValue); + state.getConnector().tableOperations().setProperty(table, setting.property.getKey(), "" + newValue); } private void changeSetting(RandomData random, State state, Properties props) throws Exception {