This is an automated email from the ASF dual-hosted git repository. janhoy pushed a commit to tag history/branches/lucene-solr/jira/solr-12730 in repository https://gitbox.apache.org/repos/asf/solr.git
commit 328b913b4697f15353969bbf60a839dda2fe98ea Author: Shalin Shekhar Mangar <[email protected]> AuthorDate: Tue Oct 30 17:11:15 2018 +0530 Enable info stream logging including ref counts Add debug printlns in directory factory Pass through expunge and related params in DUPF --- lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java | 2 +- lucene/core/src/java/org/apache/lucene/store/FSDirectory.java | 1 + solr/core/src/java/org/apache/solr/core/DirectoryFactory.java | 2 ++ solr/core/src/java/org/apache/solr/core/SolrCore.java | 1 + .../apache/solr/update/processor/DistributedUpdateProcessor.java | 6 ++++-- .../test-files/solr/configsets/cloud-minimal/conf/solrconfig.xml | 1 + .../org/apache/solr/cloud/autoscaling/IndexSizeTriggerTest.java | 2 +- 7 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java b/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java index cc9d2e0..f76cb98 100644 --- a/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java +++ b/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java @@ -108,7 +108,7 @@ final class IndexFileDeleter implements Closeable { /** Change to true to see details of reference counts when * infoStream is enabled */ - public static boolean VERBOSE_REF_COUNTS = false; + public static boolean VERBOSE_REF_COUNTS = true; private final IndexWriter writer; diff --git a/lucene/core/src/java/org/apache/lucene/store/FSDirectory.java b/lucene/core/src/java/org/apache/lucene/store/FSDirectory.java index fb03f85..db4e1f9 100644 --- a/lucene/core/src/java/org/apache/lucene/store/FSDirectory.java +++ b/lucene/core/src/java/org/apache/lucene/store/FSDirectory.java @@ -339,6 +339,7 @@ public abstract class FSDirectory extends BaseDirectory { } privateDeleteFile(name, false); maybeDeletePendingFiles(); + System.out.println("Deleted file: " + name); } /** Try to delete any pending files that we had previously tried to delete but failed diff --git a/solr/core/src/java/org/apache/solr/core/DirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/DirectoryFactory.java index fab3300..a05a36c 100644 --- a/solr/core/src/java/org/apache/solr/core/DirectoryFactory.java +++ b/solr/core/src/java/org/apache/solr/core/DirectoryFactory.java @@ -280,6 +280,8 @@ public abstract class DirectoryFactory implements NamedListInitializedPlugin, break; } } + + System.out.println(Arrays.toString(files) + " size=" + size + " on path: " + directory.toString()); return size; } diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java index abc4af6..1af7771 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrCore.java +++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java @@ -433,6 +433,7 @@ public final class SolrCore implements SolrInfoBean, SolrMetricProducer, Closeab dir = directoryFactory.get(getIndexDir(), DirContext.DEFAULT, solrConfig.indexConfig.lockType); try { size = DirectoryFactory.sizeOfDirectory(dir); + System.out.println("Found size=" + size + " for indexDir=" + getIndexDir()); } finally { directoryFactory.release(dir); } diff --git a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java index 004f4f7..cc0f8fb 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java +++ b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java @@ -235,7 +235,8 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor { // this should always be used - see filterParams DistributedUpdateProcessorFactory.addParamToDistributedRequestWhitelist - (this.req, UpdateParams.UPDATE_CHAIN, TEST_DISTRIB_SKIP_SERVERS, CommonParams.VERSION_FIELD); + (this.req, UpdateParams.UPDATE_CHAIN, TEST_DISTRIB_SKIP_SERVERS, CommonParams.VERSION_FIELD, + UpdateParams.EXPUNGE_DELETES, UpdateParams.OPTIMIZE, UpdateParams.MAX_OPTIMIZE_SEGMENTS); CoreContainer cc = req.getCore().getCoreContainer(); @@ -1387,10 +1388,11 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor { boolean dropCmd = false; if (!forwardToLeader) { dropCmd = versionDelete(cmd); + System.out.println("Doing versionDelete on " + req.getCore().getName() + " dropCmd=" + dropCmd); } if (dropCmd) { - // TODO: do we need to add anything to the response? + // TODO: do we need to add anytprocehing to the response? return; } diff --git a/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/solrconfig.xml index f671842..d98ba99 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/solrconfig.xml @@ -46,6 +46,7 @@ </requestHandler> <indexConfig> <mergeScheduler class="${solr.mscheduler:org.apache.lucene.index.ConcurrentMergeScheduler}"/> + <infoStream>true</infoStream> </indexConfig> </config> diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/IndexSizeTriggerTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/IndexSizeTriggerTest.java index a3f75dc..84833dc 100644 --- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/IndexSizeTriggerTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/IndexSizeTriggerTest.java @@ -669,7 +669,7 @@ public class IndexSizeTriggerTest extends SolrCloudTestCase { req = createAutoScalingRequest(SolrRequest.METHOD.POST, suspendTriggerCommand); response = solrClient.request(req); assertEquals(response.get("result").toString(), "success"); - System.exit(-1); +// System.exit(-1); assertEquals(1, listenerEvents.size()); events = listenerEvents.get("capturing4");
