incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject git commit: Removing a refreshing period from the balancer. It's no longer needed since the shard leveler was fixed.
Date Sun, 15 Dec 2013 14:39:49 GMT
Updated Branches:
  refs/heads/apache-blur-0.2 2a55ada58 -> 8a75d60df


Removing a refreshing period from the balancer.  It's no longer needed since the shard leveler
was fixed.


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/8a75d60d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/8a75d60d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/8a75d60d

Branch: refs/heads/apache-blur-0.2
Commit: 8a75d60df6bb901a00dfb1a7e8018d2a34feef35
Parents: 2a55ada
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Sun Dec 15 09:39:26 2013 -0500
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Sun Dec 15 09:39:26 2013 -0500

----------------------------------------------------------------------
 .../blur/manager/indexserver/DistributedIndexServer.java       | 6 ++----
 .../java/org/apache/blur/thrift/ThriftBlurShardServer.java     | 4 +---
 .../src/main/java/org/apache/blur/utils/BlurConstants.java     | 1 -
 blur-util/src/main/resources/blur-default.properties           | 3 ---
 4 files changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8a75d60d/blur-core/src/main/java/org/apache/blur/manager/indexserver/DistributedIndexServer.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/manager/indexserver/DistributedIndexServer.java
b/blur-core/src/main/java/org/apache/blur/manager/indexserver/DistributedIndexServer.java
index de45d29..12b756a 100644
--- a/blur-core/src/main/java/org/apache/blur/manager/indexserver/DistributedIndexServer.java
+++ b/blur-core/src/main/java/org/apache/blur/manager/indexserver/DistributedIndexServer.java
@@ -117,15 +117,13 @@ public class DistributedIndexServer extends AbstractDistributedIndexServer
{
   private final ConcurrentMap<String, Map<String, BlurIndex>> _indexes = new
ConcurrentHashMap<String, Map<String, BlurIndex>>();
   private final ShardStateManager _shardStateManager = new ShardStateManager();
   private final Closer _closer;
-  private final long _balancerTime;
 
   public DistributedIndexServer(Configuration configuration, ZooKeeper zookeeper, ClusterStatus
clusterStatus,
       BlurIndexWarmup warmup, BlurFilterCache filterCache, BlockCacheDirectoryFactory blockCacheDirectoryFactory,
       DistributedLayoutFactory distributedLayoutFactory, String cluster, String nodeName,
long safeModeDelay,
-      int shardOpenerThreadCount, int internalSearchThreads, int warmupThreads, int maxMergeThreads,
long balancerTime)
+      int shardOpenerThreadCount, int internalSearchThreads, int warmupThreads, int maxMergeThreads)
       throws KeeperException, InterruptedException {
     super(clusterStatus, configuration, nodeName, cluster);
-    _balancerTime = balancerTime;
     _closer = Closer.create();
     _shardOpenerThreadCount = shardOpenerThreadCount;
     _zookeeper = zookeeper;
@@ -287,7 +285,7 @@ public class DistributedIndexServer extends AbstractDistributedIndexServer
{
           LOG.info("Online shard servers changed, clearing layout managers and cache.");
         }
       }
-    }, _balancerTime, TimeUnit.MILLISECONDS);
+    });
     return _closer.register(watchOnlineShards);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8a75d60d/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java b/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java
index a511ea8..4159b91 100644
--- a/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java
+++ b/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java
@@ -26,7 +26,6 @@ import static org.apache.blur.utils.BlurConstants.BLUR_INDEXMANAGER_SEARCH_THREA
 import static org.apache.blur.utils.BlurConstants.BLUR_MAX_CLAUSE_COUNT;
 import static org.apache.blur.utils.BlurConstants.BLUR_MAX_HEAP_PER_ROW_FETCH;
 import static org.apache.blur.utils.BlurConstants.BLUR_MAX_RECORDS_PER_ROW_FETCH_REQUEST;
-import static org.apache.blur.utils.BlurConstants.BLUR_SHARD_BALANCER_PERIOD;
 import static org.apache.blur.utils.BlurConstants.BLUR_SHARD_BIND_ADDRESS;
 import static org.apache.blur.utils.BlurConstants.BLUR_SHARD_BIND_PORT;
 import static org.apache.blur.utils.BlurConstants.BLUR_SHARD_BLOCK_CACHE_TOTAL_SIZE;
@@ -208,10 +207,9 @@ public class ThriftBlurShardServer extends ThriftServer {
     int internalSearchThreads = configuration.getInt(BLUR_SHARD_WARMUP_THREAD_COUNT, 16);
     int warmupThreads = configuration.getInt(BLUR_SHARD_WARMUP_THREAD_COUNT, 16);
     int maxMergeThreads = configuration.getInt(BLUR_SHARD_MERGE_THREAD_COUNT, 3);
-    long shardBalancerPeriod = configuration.getLong(BLUR_SHARD_BALANCER_PERIOD, TimeUnit.MINUTES.toMillis(5));
     final DistributedIndexServer indexServer = new DistributedIndexServer(config, zooKeeper,
clusterStatus,
         indexWarmup, filterCache, blockCacheDirectoryFactory, distributedLayoutFactory, cluster,
nodeName,
-        safeModeDelay, shardOpenerThreadCount, internalSearchThreads, warmupThreads, maxMergeThreads,
shardBalancerPeriod);
+        safeModeDelay, shardOpenerThreadCount, internalSearchThreads, warmupThreads, maxMergeThreads);
 
     BooleanQuery.setMaxClauseCount(configuration.getInt(BLUR_MAX_CLAUSE_COUNT, 1024));
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8a75d60d/blur-util/src/main/java/org/apache/blur/utils/BlurConstants.java
----------------------------------------------------------------------
diff --git a/blur-util/src/main/java/org/apache/blur/utils/BlurConstants.java b/blur-util/src/main/java/org/apache/blur/utils/BlurConstants.java
index 82ce116..b2622f7 100644
--- a/blur-util/src/main/java/org/apache/blur/utils/BlurConstants.java
+++ b/blur-util/src/main/java/org/apache/blur/utils/BlurConstants.java
@@ -41,7 +41,6 @@ public class BlurConstants {
   public static final String HIGH_COMPRESSION = "HIGH_COMPRESSION";
   public static final String BLUR_SHARD_INDEX_CHUNKSIZE = "blur.shard.index.chunksize";
   public static final String BLUR_SHARD_INDEX_COMPRESSIONMODE = "blur.shard.index.compressionmode";
-  public static final String BLUR_SHARD_BALANCER_PERIOD = "blur.shard.balancer.period";
   public static final String BLUR_TABLE_PATH = "blur.table.path";
   public static final String BLUR_ZOOKEEPER_CONNECTION = "blur.zookeeper.connection";
   public static final String BLUR_ZOOKEEPER_TRACE_PATH = "blur.zookeeper.trace.path";

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8a75d60d/blur-util/src/main/resources/blur-default.properties
----------------------------------------------------------------------
diff --git a/blur-util/src/main/resources/blur-default.properties b/blur-util/src/main/resources/blur-default.properties
index 1876519..b6f4b58 100644
--- a/blur-util/src/main/resources/blur-default.properties
+++ b/blur-util/src/main/resources/blur-default.properties
@@ -148,9 +148,6 @@ blur.shard.time.between.refreshs=3000
 # The max number of threads used during index merges
 blur.shard.merge.thread.count=3
 
-# The time period in which the balancer will recalculate the shard distribution.  NOTE: This
is time is per shard server so the checking may occur more often.
-blur.shard.balancer.period=300000
-
 # The maximum number of clauses in a BooleanQuery
 blur.max.clause.count=1024
 


Mime
View raw message