incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [1/2] git commit: Starting to work on Metrics.
Date Wed, 27 Mar 2013 21:13:21 GMT
Updated Branches:
  refs/heads/0.1.5 8f43732a4 -> e7e1a4067


Starting to work on Metrics.


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

Branch: refs/heads/0.1.5
Commit: 434f3a9d88a053d03a58a4759911ae9f74323421
Parents: 8f43732
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Wed Mar 27 16:43:20 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Wed Mar 27 16:43:20 2013 -0400

----------------------------------------------------------------------
 .../indexserver/DistributedIndexServer.java        |  241 ++++++++-------
 .../apache/blur/thrift/ThriftBlurShardServer.java  |    7 -
 .../store/refcounter/DirectoryReferenceFileGC.java |    4 +-
 .../java/org/apache/blur/metrics/BlurMetrics.java  |   12 +-
 .../org/apache/blur/metrics/MetricsConstants.java  |    5 +
 5 files changed, 143 insertions(+), 126 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/434f3a9d/src/blur-core/src/main/java/org/apache/blur/manager/indexserver/DistributedIndexServer.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/manager/indexserver/DistributedIndexServer.java
b/src/blur-core/src/main/java/org/apache/blur/manager/indexserver/DistributedIndexServer.java
index e435310..8d96bb7 100644
--- a/src/blur-core/src/main/java/org/apache/blur/manager/indexserver/DistributedIndexServer.java
+++ b/src/blur-core/src/main/java/org/apache/blur/manager/indexserver/DistributedIndexServer.java
@@ -16,6 +16,12 @@ package org.apache.blur.manager.indexserver;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import static org.apache.blur.metrics.MetricsConstants.BLUR;
+import static org.apache.blur.metrics.MetricsConstants.INDEX_COUNT;
+import static org.apache.blur.metrics.MetricsConstants.INDEX_MEMORY_USAGE;
+import static org.apache.blur.metrics.MetricsConstants.ORG_APACHE_BLUR;
+import static org.apache.blur.metrics.MetricsConstants.SEGMENT_COUNT;
+import static org.apache.blur.metrics.MetricsConstants.TABLE_COUNT;
 import static org.apache.blur.utils.BlurConstants.SHARD_PREFIX;
 
 import java.io.IOException;
@@ -49,9 +55,9 @@ import org.apache.blur.manager.BlurFilterCache;
 import org.apache.blur.manager.clusterstatus.ClusterStatus;
 import org.apache.blur.manager.clusterstatus.ZookeeperPathConstants;
 import org.apache.blur.manager.writer.BlurIndex;
-import org.apache.blur.manager.writer.BlurIndexRefresher;
 import org.apache.blur.manager.writer.BlurNRTIndex;
 import org.apache.blur.manager.writer.SharedMergeScheduler;
+import org.apache.blur.metrics.AtomicLongGauge;
 import org.apache.blur.metrics.BlurMetrics;
 import org.apache.blur.server.IndexSearcherClosable;
 import org.apache.blur.server.ShardContext;
@@ -72,7 +78,6 @@ import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.compress.CompressionCodec;
-import org.apache.lucene.index.IndexDeletionPolicy;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.similarities.Similarity;
 import org.apache.lucene.store.Directory;
@@ -82,6 +87,8 @@ import org.apache.zookeeper.ZooDefs.Ids;
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.Stat;
 
+import com.yammer.metrics.Metrics;
+import com.yammer.metrics.core.MetricName;
 
 public class DistributedIndexServer extends AbstractIndexServer {
 
@@ -101,7 +108,6 @@ public class DistributedIndexServer extends AbstractIndexServer {
   private Configuration _configuration;
   private String _nodeName;
   private int _shardOpenerThreadCount;
-  private BlurIndexRefresher _refresher;
   private Cache _cache;
   private BlurMetrics _blurMetrics;
   private ZooKeeper _zookeeper;
@@ -115,24 +121,35 @@ public class DistributedIndexServer extends AbstractIndexServer {
   private AtomicBoolean _running = new AtomicBoolean();
   private long _safeModeDelay;
   private BlurIndexWarmup _warmup = new DefaultBlurIndexWarmup();
-  private IndexDeletionPolicy _indexDeletionPolicy;
   private DirectoryReferenceFileGC _gc;
   private WatchChildren _watchOnlineShards;
-  
+
   private SharedMergeScheduler _mergeScheduler;
   private IndexInputCloser _closer = null;
   private ExecutorService _searchExecutor = null;
-
+  
+  private AtomicLong _tableCount = new AtomicLong();
+  private AtomicLong _indexCount = new AtomicLong();
+  private AtomicLong _segmentCount = new AtomicLong();
+  private AtomicLong _indexMemoryUsage = new AtomicLong();
+  
   public static interface ReleaseReader {
     void release() throws IOException;
   }
 
   public void init() throws KeeperException, InterruptedException, IOException {
+    // evictions = Metrics.newMeter(new MetricName(ORG_APACHE_BLUR, CACHE,
+    // EVICTION), EVICTION, TimeUnit.SECONDS);
+    Metrics.newGauge(new MetricName(ORG_APACHE_BLUR, BLUR, TABLE_COUNT), new AtomicLongGauge(_tableCount));
+    Metrics.newGauge(new MetricName(ORG_APACHE_BLUR, BLUR, INDEX_COUNT), new AtomicLongGauge(_indexCount));
+    Metrics.newGauge(new MetricName(ORG_APACHE_BLUR, BLUR, SEGMENT_COUNT), new AtomicLongGauge(_segmentCount));
+    Metrics.newGauge(new MetricName(ORG_APACHE_BLUR, BLUR, INDEX_MEMORY_USAGE), new AtomicLongGauge(_indexMemoryUsage));
+
     BlurUtil.setupZookeeper(_zookeeper, _cluster);
     _openerService = Executors.newThreadPool("shard-opener", _shardOpenerThreadCount);
     _gc = new DirectoryReferenceFileGC();
     _gc.init();
-    
+
     // @TODO allow for configuration of these
     _mergeScheduler = new SharedMergeScheduler();
     _searchExecutor = Executors.newThreadPool("internal-search", 16);
@@ -154,31 +171,32 @@ public class DistributedIndexServer extends AbstractIndexServer {
 
   private void watchForShardServerChanges() {
     ZookeeperPathConstants.getOnlineShardsPath(_cluster);
-    _watchOnlineShards = new WatchChildren(_zookeeper, ZookeeperPathConstants.getOnlineShardsPath(_cluster)).watch(new
OnChange() {
-      private List<String> _prevOnlineShards = new ArrayList<String>();
+    _watchOnlineShards = new WatchChildren(_zookeeper, ZookeeperPathConstants.getOnlineShardsPath(_cluster))
+        .watch(new OnChange() {
+          private List<String> _prevOnlineShards = new ArrayList<String>();
 
-      @Override
-      public void action(List<String> onlineShards) {
-        List<String> oldOnlineShards = _prevOnlineShards;
-        _prevOnlineShards = onlineShards;
-        _layoutManagers.clear();
-        _layoutCache.clear();
-        LOG.info("Online shard servers changed, clearing layout managers and cache.");
-        if (oldOnlineShards == null) {
-          oldOnlineShards = new ArrayList<String>();
-        }
-        for (String oldOnlineShard : oldOnlineShards) {
-          if (!onlineShards.contains(oldOnlineShard)) {
-            LOG.info("Node went offline [{0}]", oldOnlineShard);
-          }
-        }
-        for (String onlineShard : onlineShards) {
-          if (!oldOnlineShards.contains(onlineShard)) {
-            LOG.info("Node came online [{0}]", onlineShard);
+          @Override
+          public void action(List<String> onlineShards) {
+            List<String> oldOnlineShards = _prevOnlineShards;
+            _prevOnlineShards = onlineShards;
+            _layoutManagers.clear();
+            _layoutCache.clear();
+            LOG.info("Online shard servers changed, clearing layout managers and cache.");
+            if (oldOnlineShards == null) {
+              oldOnlineShards = new ArrayList<String>();
+            }
+            for (String oldOnlineShard : oldOnlineShards) {
+              if (!onlineShards.contains(oldOnlineShard)) {
+                LOG.info("Node went offline [{0}]", oldOnlineShard);
+              }
+            }
+            for (String onlineShard : onlineShards) {
+              if (!oldOnlineShards.contains(onlineShard)) {
+                LOG.info("Node came online [{0}]", onlineShard);
+              }
+            }
           }
-        }
-      }
-    });
+        });
   }
 
   private void waitInSafeModeIfNeeded() throws KeeperException, InterruptedException {
@@ -213,7 +231,8 @@ public class DistributedIndexServer extends AbstractIndexServer {
     String blurSafemodePath = ZookeeperPathConstants.getSafemodePath(_cluster);
     Stat stat = _zookeeper.exists(blurSafemodePath, false);
     if (stat == null) {
-      _zookeeper.create(blurSafemodePath, Long.toString(timestamp).getBytes(), Ids.OPEN_ACL_UNSAFE,
CreateMode.PERSISTENT);
+      _zookeeper.create(blurSafemodePath, Long.toString(timestamp).getBytes(), Ids.OPEN_ACL_UNSAFE,
+          CreateMode.PERSISTENT);
     } else {
       _zookeeper.setData(blurSafemodePath, Long.toString(timestamp).getBytes(), -1);
     }
@@ -248,7 +267,7 @@ public class DistributedIndexServer extends AbstractIndexServer {
       private void warmup() {
         if (_running.get()) {
           List<String> tableList = _clusterStatus.getTableList(false, _cluster);
-          _blurMetrics.tableCount.set(tableList.size());
+          _tableCount.set(tableList.size());
           long indexCount = 0;
           AtomicLong segmentCount = new AtomicLong();
           AtomicLong indexMemoryUsage = new AtomicLong();
@@ -263,26 +282,27 @@ public class DistributedIndexServer extends AbstractIndexServer {
               LOG.error("Unknown error trying to warm table [{0}]", e, table);
             }
           }
-          _blurMetrics.indexCount.set(indexCount);
-          _blurMetrics.segmentCount.set(segmentCount.get());
-          _blurMetrics.indexMemoryUsage.set(indexMemoryUsage.get());
+          _indexCount.set(indexCount);
+          _segmentCount.set(segmentCount.get());
+          _indexMemoryUsage.set(indexMemoryUsage.get());
         }
       }
 
-      private void updateMetrics(BlurMetrics blurMetrics, Map<String, BlurIndex> indexes,
AtomicLong segmentCount, AtomicLong indexMemoryUsage) throws IOException {
+      private void updateMetrics(BlurMetrics blurMetrics, Map<String, BlurIndex> indexes,
AtomicLong segmentCount,
+          AtomicLong indexMemoryUsage) throws IOException {
         // @TODO not sure how to do this yet
-//        for (BlurIndex index : indexes.values()) {
-//          IndexReader reader = index.getIndexReader();
-//          try {
-//            IndexReader[] readers = reader.getSequentialSubReaders();
-//            if (readers != null) {
-//              segmentCount.addAndGet(readers.length);
-//            }
-//            indexMemoryUsage.addAndGet(BlurUtil.getMemoryUsage(reader));
-//          } finally {
-//            reader.decRef();
-//          }
-//        }
+        // for (BlurIndex index : indexes.values()) {
+        // IndexReader reader = index.getIndexReader();
+        // try {
+        // IndexReader[] readers = reader.getSequentialSubReaders();
+        // if (readers != null) {
+        // segmentCount.addAndGet(readers.length);
+        // }
+        // indexMemoryUsage.addAndGet(BlurUtil.getMemoryUsage(reader));
+        // } finally {
+        // reader.decRef();
+        // }
+        // }
       }
     }, _delay, _delay);
   }
@@ -487,17 +507,19 @@ public class DistributedIndexServer extends AbstractIndexServer {
     String compressionClass = descriptor.compressionClass;
     int compressionBlockSize = descriptor.compressionBlockSize;
     if (compressionClass != null) {
-//      throw new RuntimeException("Not supported yet");
+      // throw new RuntimeException("Not supported yet");
       LOG.error("Not supported yet");
-//      CompressionCodec compressionCodec;
-//      try {
-//        compressionCodec = BlurUtil.getInstance(compressionClass, CompressionCodec.class);
-//        directory = new CompressedFieldDataDirectory(directory, compressionCodec, compressionBlockSize);
-//      } catch (Exception e) {
-//        throw new IOException(e);
-//      }
-    }
-    
+      // CompressionCodec compressionCodec;
+      // try {
+      // compressionCodec = BlurUtil.getInstance(compressionClass,
+      // CompressionCodec.class);
+      // directory = new CompressedFieldDataDirectory(directory,
+      // compressionCodec, compressionBlockSize);
+      // } catch (Exception e) {
+      // throw new IOException(e);
+      // }
+    }
+
     TableContext tableContext = TableContext.create(descriptor);
     ShardContext shardContext = ShardContext.create(tableContext, shard);
 
@@ -512,17 +534,17 @@ public class DistributedIndexServer extends AbstractIndexServer {
 
     BlurIndex index;
     if (_clusterStatus.isReadOnly(true, _cluster, table)) {
-//      BlurIndexReader reader = new BlurIndexReader();
-//      reader.setCloser(_closer);
-//      reader.setAnalyzer(getAnalyzer(table));
-//      reader.setDirectory(dir);
-//      reader.setRefresher(_refresher);
-//      reader.setShard(shard);
-//      reader.setTable(table);
-//      reader.setIndexDeletionPolicy(_indexDeletionPolicy);
-//      reader.setSimilarity(getSimilarity(table));
-//      reader.init();
-//      index = reader;
+      // BlurIndexReader reader = new BlurIndexReader();
+      // reader.setCloser(_closer);
+      // reader.setAnalyzer(getAnalyzer(table));
+      // reader.setDirectory(dir);
+      // reader.setRefresher(_refresher);
+      // reader.setShard(shard);
+      // reader.setTable(table);
+      // reader.setIndexDeletionPolicy(_indexDeletionPolicy);
+      // reader.setSimilarity(getSimilarity(table));
+      // reader.init();
+      // index = reader;
       throw new RuntimeException("not impl");
     } else {
       BlurNRTIndex writer = new BlurNRTIndex(shardContext, _mergeScheduler, _closer, dir,
_gc, _searchExecutor);
@@ -550,40 +572,45 @@ public class DistributedIndexServer extends AbstractIndexServer {
 
   private void warmUpAllSegments(IndexReader reader) throws IOException {
     LOG.warn("Warm up NOT supported yet.");
-    //Once the reader warm-up has been re-implemented, this code will change accordingly.
-    
-//    IndexReader[] indexReaders = reader.getSequentialSubReaders();
-//    if (indexReaders != null) {
-//      for (IndexReader r : indexReaders) {
-//        warmUpAllSegments(r);
-//      }
-//    }
-//    int maxDoc = reader.maxDoc();
-//    int numDocs = reader.numDocs();
-//    FieldInfos fieldInfos = ReaderUtil.getMergedFieldInfos(reader);
-//    Collection<String> fieldNames = new ArrayList<String>();
-//    for (FieldInfo fieldInfo : fieldInfos) {
-//      if (fieldInfo.isIndexed) {
-//        fieldNames.add(fieldInfo.name);
-//      }
-//    }
-//    int primeDocCount = reader.docFreq(BlurConstants.PRIME_DOC_TERM);
-//    TermDocs termDocs = reader.termDocs(BlurConstants.PRIME_DOC_TERM);
-//    termDocs.next();
-//    termDocs.close();
-//
-//    TermPositions termPositions = reader.termPositions(BlurConstants.PRIME_DOC_TERM);
-//    if (termPositions.next()) {
-//      if (termPositions.freq() > 0) {
-//        termPositions.nextPosition();
-//      }
-//    }
-//    termPositions.close();
-//    LOG.info("Warmup of indexreader [" + reader + "] complete, maxDocs [" + maxDoc + "],
numDocs [" + numDocs + "], primeDocumentCount [" + primeDocCount + "], fieldCount ["
-//        + fieldNames.size() + "]");
-  }
-
-  private synchronized Map<String, BlurIndex> openMissingShards(final String table,
Set<String> shardsToServe, final Map<String, BlurIndex> tableIndexes) {
+    // Once the reader warm-up has been re-implemented, this code will change
+    // accordingly.
+
+    // IndexReader[] indexReaders = reader.getSequentialSubReaders();
+    // if (indexReaders != null) {
+    // for (IndexReader r : indexReaders) {
+    // warmUpAllSegments(r);
+    // }
+    // }
+    // int maxDoc = reader.maxDoc();
+    // int numDocs = reader.numDocs();
+    // FieldInfos fieldInfos = ReaderUtil.getMergedFieldInfos(reader);
+    // Collection<String> fieldNames = new ArrayList<String>();
+    // for (FieldInfo fieldInfo : fieldInfos) {
+    // if (fieldInfo.isIndexed) {
+    // fieldNames.add(fieldInfo.name);
+    // }
+    // }
+    // int primeDocCount = reader.docFreq(BlurConstants.PRIME_DOC_TERM);
+    // TermDocs termDocs = reader.termDocs(BlurConstants.PRIME_DOC_TERM);
+    // termDocs.next();
+    // termDocs.close();
+    //
+    // TermPositions termPositions =
+    // reader.termPositions(BlurConstants.PRIME_DOC_TERM);
+    // if (termPositions.next()) {
+    // if (termPositions.freq() > 0) {
+    // termPositions.nextPosition();
+    // }
+    // }
+    // termPositions.close();
+    // LOG.info("Warmup of indexreader [" + reader + "] complete, maxDocs [" +
+    // maxDoc + "], numDocs [" + numDocs + "], primeDocumentCount [" +
+    // primeDocCount + "], fieldCount ["
+    // + fieldNames.size() + "]");
+  }
+
+  private synchronized Map<String, BlurIndex> openMissingShards(final String table,
Set<String> shardsToServe,
+      final Map<String, BlurIndex> tableIndexes) {
     Map<String, Future<BlurIndex>> opening = new HashMap<String, Future<BlurIndex>>();
     for (String s : shardsToServe) {
       final String shard = s;
@@ -796,10 +823,6 @@ public class DistributedIndexServer extends AbstractIndexServer {
     _shardOpenerThreadCount = shardOpenerThreadCount;
   }
 
-  public void setRefresher(BlurIndexRefresher refresher) {
-    _refresher = refresher;
-  }
-
   public void setCache(Cache cache) {
     _cache = cache;
   }
@@ -824,10 +847,6 @@ public class DistributedIndexServer extends AbstractIndexServer {
     _warmup = warmup;
   }
 
-  public void setIndexDeletionPolicy(IndexDeletionPolicy indexDeletionPolicy) {
-    _indexDeletionPolicy = indexDeletionPolicy;
-  }
-  
   public void setClusterName(String cluster) {
     _cluster = cluster;
   }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/434f3a9d/src/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java
b/src/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java
index 3a74664..2ea1599 100644
--- a/src/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java
+++ b/src/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java
@@ -33,8 +33,6 @@ import static org.apache.blur.utils.BlurConstants.BLUR_SHARD_INDEX_WARMUP_CLASS;
 import static org.apache.blur.utils.BlurConstants.BLUR_SHARD_OPENER_THREAD_COUNT;
 import static org.apache.blur.utils.BlurConstants.BLUR_SHARD_SAFEMODEDELAY;
 import static org.apache.blur.utils.BlurConstants.BLUR_SHARD_SERVER_THRIFT_THREAD_COUNT;
-import static org.apache.blur.utils.BlurConstants.BLUR_SHARD_TIME_BETWEEN_COMMITS;
-import static org.apache.blur.utils.BlurConstants.BLUR_SHARD_TIME_BETWEEN_REFRESHS;
 import static org.apache.blur.utils.BlurConstants.BLUR_ZOOKEEPER_CONNECTION;
 import static org.apache.blur.utils.BlurConstants.BLUR_ZOOKEEPER_SYSTEM_TIME_TOLERANCE;
 import static org.apache.blur.utils.BlurUtil.quietClose;
@@ -66,8 +64,6 @@ import org.apache.blur.thrift.generated.Blur.Iface;
 import org.apache.blur.utils.BlurUtil;
 import org.apache.blur.zookeeper.ZkUtils;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.lucene.index.IndexDeletionPolicy;
-import org.apache.lucene.index.KeepOnlyLastCommitDeletionPolicy;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.Code;
 import org.apache.zookeeper.ZooKeeper;
@@ -175,7 +171,6 @@ public class ThriftBlurShardServer extends ThriftServer {
 
     BlurFilterCache filterCache = getFilterCache(configuration);
     BlurIndexWarmup indexWarmup = getIndexWarmup(configuration);
-    IndexDeletionPolicy indexDeletionPolicy = new KeepOnlyLastCommitDeletionPolicy();
 
     final DistributedIndexServer indexServer = new DistributedIndexServer();
     indexServer.setBlurMetrics(blurMetrics);
@@ -184,13 +179,11 @@ public class ThriftBlurShardServer extends ThriftServer {
     indexServer.setClusterName(configuration.get(BLUR_CLUSTER_NAME, BLUR_CLUSTER));
     indexServer.setConfiguration(config);
     indexServer.setNodeName(nodeName);
-    indexServer.setRefresher(refresher);
     indexServer.setShardOpenerThreadCount(configuration.getInt(BLUR_SHARD_OPENER_THREAD_COUNT,
16));
     indexServer.setZookeeper(zooKeeper);
     indexServer.setFilterCache(filterCache);
     indexServer.setSafeModeDelay(configuration.getLong(BLUR_SHARD_SAFEMODEDELAY, 60000));
     indexServer.setWarmup(indexWarmup);
-    indexServer.setIndexDeletionPolicy(indexDeletionPolicy);
     indexServer.init();
 
     final IndexManager indexManager = new IndexManager();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/434f3a9d/src/blur-store/src/main/java/org/apache/blur/lucene/store/refcounter/DirectoryReferenceFileGC.java
----------------------------------------------------------------------
diff --git a/src/blur-store/src/main/java/org/apache/blur/lucene/store/refcounter/DirectoryReferenceFileGC.java
b/src/blur-store/src/main/java/org/apache/blur/lucene/store/refcounter/DirectoryReferenceFileGC.java
index f4b9e0a..508ce9d 100644
--- a/src/blur-store/src/main/java/org/apache/blur/lucene/store/refcounter/DirectoryReferenceFileGC.java
+++ b/src/blur-store/src/main/java/org/apache/blur/lucene/store/refcounter/DirectoryReferenceFileGC.java
@@ -32,10 +32,10 @@ import org.apache.lucene.store.Directory;
 import com.yammer.metrics.Metrics;
 import com.yammer.metrics.core.Gauge;
 import com.yammer.metrics.core.MetricName;
+import static org.apache.blur.metrics.MetricsConstants.*;
 
 public class DirectoryReferenceFileGC extends TimerTask implements Closeable {
 
-  private static final String ORG_APACHE_BLUR = "org.apache.blur";
 
   private static final Log LOG = LogFactory.getLog(DirectoryReferenceFileGC.class);
 
@@ -73,7 +73,7 @@ public class DirectoryReferenceFileGC extends TimerTask implements Closeable
{
     _timer = new Timer("Blur-File-GC", true);
     _timer.scheduleAtFixedRate(this, _delay, _delay);
     _queue = new LinkedBlockingQueue<Value>();
-    Metrics.newGauge(new MetricName(ORG_APACHE_BLUR, "Lucene", "Files in Queue to be Deleted"),
new Gauge<Integer>() {
+    Metrics.newGauge(new MetricName(ORG_APACHE_BLUR, LUCENE, FILES_IN_QUEUE_TO_BE_DELETED),
new Gauge<Integer>() {
       @Override
       public Integer value() {
         return numberOfFilesToBeDeleted;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/434f3a9d/src/blur-util/src/main/java/org/apache/blur/metrics/BlurMetrics.java
----------------------------------------------------------------------
diff --git a/src/blur-util/src/main/java/org/apache/blur/metrics/BlurMetrics.java b/src/blur-util/src/main/java/org/apache/blur/metrics/BlurMetrics.java
index abe0a2d..3fd056f 100644
--- a/src/blur-util/src/main/java/org/apache/blur/metrics/BlurMetrics.java
+++ b/src/blur-util/src/main/java/org/apache/blur/metrics/BlurMetrics.java
@@ -51,12 +51,12 @@ public class BlurMetrics implements Updater {
   public AtomicLong blurShardBuffercacheLost = new AtomicLong(0);
   public Map<String, MethodCall> methodCalls = new ConcurrentHashMap<String, MethodCall>();
 
-  public AtomicLong tableCount = new AtomicLong(0);
-  public AtomicLong rowCount = new AtomicLong(0);
-  public AtomicLong recordCount = new AtomicLong(0);
-  public AtomicLong indexCount = new AtomicLong(0);
-  public AtomicLong indexMemoryUsage = new AtomicLong(0);
-  public AtomicLong segmentCount = new AtomicLong(0);
+//  public AtomicLong tableCount = new AtomicLong(0);
+//  public AtomicLong rowCount = new AtomicLong(0);
+//  public AtomicLong recordCount = new AtomicLong(0);
+//  public AtomicLong indexCount = new AtomicLong(0);
+//  public AtomicLong indexMemoryUsage = new AtomicLong(0);
+//  public AtomicLong segmentCount = new AtomicLong(0);
 
   private MetricsRecord _metricsRecord;
   private long _previous = System.nanoTime();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/434f3a9d/src/blur-util/src/main/java/org/apache/blur/metrics/MetricsConstants.java
----------------------------------------------------------------------
diff --git a/src/blur-util/src/main/java/org/apache/blur/metrics/MetricsConstants.java b/src/blur-util/src/main/java/org/apache/blur/metrics/MetricsConstants.java
index f5e0a09..2043bfe 100644
--- a/src/blur-util/src/main/java/org/apache/blur/metrics/MetricsConstants.java
+++ b/src/blur-util/src/main/java/org/apache/blur/metrics/MetricsConstants.java
@@ -22,4 +22,9 @@ public class MetricsConstants {
   public static final String MISS = "Miss";
   public static final String CACHE = "Cache";
   public static final String EVICTION = "Eviction";
+  public static final String TABLE_COUNT = "Table Count";
+  public static final String FILES_IN_QUEUE_TO_BE_DELETED = "Files in Queue to be Deleted";
+  public static final String INDEX_MEMORY_USAGE = "Index Memory Usage";
+  public static final String SEGMENT_COUNT = "Segment Count";
+  public static final String INDEX_COUNT = "Index Count";
 }


Mime
View raw message