svn commit: r1543205 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java

[ma...@apache.org]

Author: markrmiller
Date: Mon Nov 18 22:33:25 2013
New Revision: 1543205

URL: http://svn.apache.org/r1543205
Log:
tests: set request info on SyncStrategy for better logging

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java?rev=1543205&r1=1543204&r2=1543205&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java Mon Nov 18 22:33:25 2013
@@ -43,6 +43,10 @@ import org.apache.solr.handler.component
 import org.apache.solr.handler.component.ShardHandler;
 import org.apache.solr.handler.component.ShardRequest;
 import org.apache.solr.handler.component.ShardResponse;
+import org.apache.solr.request.LocalSolrQueryRequest;
+import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.request.SolrRequestInfo;
+import org.apache.solr.response.SolrQueryResponse;
 import org.apache.solr.update.PeerSync;
 import org.apache.solr.util.DefaultSolrThreadFactory;
 import org.slf4j.Logger;
@@ -86,17 +90,25 @@ public class SyncStrategy {
     if (SKIP_AUTO_RECOVERY) {
       return true;
     }
-    if (isClosed) {
-      log.warn("Closed, skipping sync up.");
-      return false;
-    }
-    log.info("Sync replicas to " + ZkCoreNodeProps.getCoreUrl(leaderProps));
-
-    if (core.getUpdateHandler().getUpdateLog() == null) {
-      log.error("No UpdateLog found - cannot sync");
-      return false;
+    boolean success;
+    SolrQueryRequest req = new LocalSolrQueryRequest(core, new ModifiableSolrParams());
+    SolrQueryResponse rsp = new SolrQueryResponse();
+    SolrRequestInfo.setRequestInfo(new SolrRequestInfo(req, rsp));
+    try {
+      if (isClosed) {
+        log.warn("Closed, skipping sync up.");
+        return false;
+      }
+      log.info("Sync replicas to " + ZkCoreNodeProps.getCoreUrl(leaderProps));
+      
+      if (core.getUpdateHandler().getUpdateLog() == null) {
+        log.error("No UpdateLog found - cannot sync");
+        return false;
+      }
+      success = syncReplicas(zkController, core, leaderProps);
+    } finally {
+      SolrRequestInfo.clearRequestInfo();
     }
-    boolean success = syncReplicas(zkController, core, leaderProps);
     return success;
   }