You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2012/07/05 22:36:05 UTC
svn commit: r1357887 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/core/SolrCore.java
core/src/test/org/apache/solr/BasicFunctionalityTest.java
core/src/test/org/apache/solr/cloud/BasicZkTest.java
Author: markrmiller
Date: Thu Jul 5 20:36:05 2012
New Revision: 1357887
URL: http://svn.apache.org/viewvc?rev=1357887&view=rev
Log:
SOLR-3355: Add shard and collection to SolrCore statistics.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1357887&r1=1357886&r2=1357887&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Thu Jul 5 20:36:05 2012
@@ -59,6 +59,8 @@ Other Changes
* SOLR-1770: Move the default core instance directory into a collection1 folder.
(Mark Miller)
+
+* SOLR-3355: Add shard and collection to SolrCore statistics. (Michael Garski, Mark Miller)
================== 4.0.0-ALPHA ==================
More information about this release, including any errata related to the
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1357887&r1=1357886&r2=1357887&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java Thu Jul 5 20:36:05 2012
@@ -25,6 +25,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.LockObtainFailedException;
+import org.apache.solr.cloud.CloudDescriptor;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.CommonParams.EchoParamStyle;
@@ -1980,9 +1981,18 @@ public final class SolrCore implements S
lst.add("startTime", new Date(startTime));
lst.add("refCount", getOpenCount());
- if (null != getCoreDescriptor() && null != getCoreDescriptor().getCoreContainer()) {
- lst.add("aliases", getCoreDescriptor().getCoreContainer().getCoreNames(this));
+ CoreDescriptor cd = getCoreDescriptor();
+ if (cd != null) {
+ if (null != cd && cd.getCoreContainer() != null) {
+ lst.add("aliases", getCoreDescriptor().getCoreContainer().getCoreNames(this));
+ }
+ CloudDescriptor cloudDesc = cd.getCloudDescriptor();
+ if (cloudDesc != null) {
+ lst.add("collection", cloudDesc.getCollectionName());
+ lst.add("shard", cloudDesc.getShardId());
+ }
}
+
return lst;
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java?rev=1357887&r1=1357886&r2=1357887&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java Thu Jul 5 20:36:05 2012
@@ -128,6 +128,11 @@ public class BasicFunctionalityTest exte
IndexWriter writer = ((DirectUpdateHandler2)core.getUpdateHandler()).getSolrCoreState().getIndexWriter(core);
assertEquals("Mergefactor was not picked up", 8, ((LogMergePolicy)writer.getConfig().getMergePolicy()).getMergeFactor());
+ // test stats call
+ NamedList stats = core.getStatistics();
+ assertEquals("collection1", stats.get("coreName"));
+ assertTrue(stats.get("refCount") != null);
+
lrf.args.put(CommonParams.VERSION,"2.2");
assertQ("test query on empty index",
req("qlkciyopsbgzyvkylsjhchghjrdf")
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java?rev=1357887&r1=1357886&r2=1357887&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java Thu Jul 5 20:36:05 2012
@@ -23,6 +23,7 @@ import org.apache.lucene.util.LuceneTest
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest;
@@ -160,6 +161,13 @@ public class BasicZkTest extends Abstrac
}
+ // test stats call
+ NamedList stats = core.getStatistics();
+ assertEquals("collection1", stats.get("coreName"));
+ assertEquals("collection1", stats.get("collection"));
+ assertEquals("shard1", stats.get("shard"));
+ assertTrue(stats.get("refCount") != null);
+
//zkController.getZkClient().printLayoutToStdOut();
}