accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1461555 - in /accumulo/branches/1.5: core/src/main/java/org/apache/accumulo/core/conf/ server/src/main/java/org/apache/accumulo/server/client/ server/src/main/java/org/apache/accumulo/server/conf/
Date Wed, 27 Mar 2013 12:51:39 GMT
Author: ecn
Date: Wed Mar 27 12:51:39 2013
New Revision: 1461555

URL: http://svn.apache.org/r1461555
Log:
ACCUMULO-1214 invalidate the zookeeper cache when returning results to clients

Modified:
    accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
    accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
    accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java

Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java?rev=1461555&r1=1461554&r2=1461555&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
(original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
Wed Mar 27 12:51:39 2013
@@ -177,4 +177,8 @@ public abstract class AccumuloConfigurat
     
     return maxFilesPerTablet;
   }
+  
+  public void invalidateCache() {
+    // overridden in ZooConfiguration
+  }
 }

Modified: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java?rev=1461555&r1=1461554&r2=1461555&view=diff
==============================================================================
--- accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
(original)
+++ accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
Wed Mar 27 12:51:39 2013
@@ -188,6 +188,7 @@ public class ClientServiceHandler implem
   
   static private Map<String,String> conf(TCredentials credentials, AccumuloConfiguration
conf) throws TException {
     security.authenticateUser(credentials, credentials);
+    conf.invalidateCache();
     
     Map<String,String> result = new HashMap<String,String>();
     for (Entry<String,String> entry : conf) {

Modified: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java?rev=1461555&r1=1461554&r2=1461555&view=diff
==============================================================================
--- accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java
(original)
+++ accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java
Wed Mar 27 12:51:39 2013
@@ -68,6 +68,11 @@ public class ZooConfiguration extends Ac
     return instance;
   }
   
+  public void invalidateCache() {
+    if (propCache != null)
+      propCache.clear();
+  }
+  
   private String _get(Property property) {
     String key = property.getKey();
     String value = null;



Mime
View raw message