You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2015/01/08 12:07:43 UTC
svn commit: r1650252 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/handler/BlobHandler.java
solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java
Author: noble
Date: Thu Jan 8 11:07:43 2015
New Revision: 1650252
URL: http://svn.apache.org/r1650252
Log:
SOLR-6787 more logging
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/BlobHandler.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/BlobHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/BlobHandler.java?rev=1650252&r1=1650251&r2=1650252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/BlobHandler.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/BlobHandler.java Thu Jan 8 11:07:43 2015
@@ -86,10 +86,12 @@ public class BlobHandler extends Request
}
String err = SolrConfigHandler.validateName(blobName);
if(err!=null){
+ log.warn("no blob name");
rsp.add("error", err);
return;
}
if(req.getContentStreams() == null ) {
+ log.warn("no content stream");
rsp.add("error","No stream");
return;
}
@@ -109,6 +111,7 @@ public class BlobHandler extends Request
"q", "md5:" + md5,
"fl", "id,size,version,timestamp,blobName")),
rsp);
+ log.warn("duplicate entry for blob :"+blobName);
return;
}
@@ -123,7 +126,8 @@ public class BlobHandler extends Request
}
version++;
String id = blobName+"/"+version;
- indexMap(req, makeMap(
+ log.info(MessageFormat.format("New blob inserting {0} ,size {1}, md5 {2}",id, payload.limit(),md5));
+ indexMap(req, rsp, makeMap(
"id", id,
"md5", md5,
"blobName", blobName,
@@ -131,6 +135,8 @@ public class BlobHandler extends Request
"timestamp", new Date(),
"size", payload.limit(),
"blob", payload));
+ log.info(" Successfully Added and committed a blob with id {} and size {} ",id, payload.limit());
+
break;
}
@@ -188,24 +194,25 @@ public class BlobHandler extends Request
req.forward(null,
new MapSolrParams((Map) makeMap(
- "q", MessageFormat.format(q,blobName,version),
+ "q", MessageFormat.format(q, blobName, version),
"fl", "id,size,version,timestamp,blobName,md5",
"sort", "version desc"))
- ,rsp);
+ , rsp);
}
}
}
- public static void indexMap(SolrQueryRequest req, Map<String, Object> doc) throws IOException {
+ public static void indexMap(SolrQueryRequest req, SolrQueryResponse rsp, Map<String, Object> doc) throws IOException {
SolrInputDocument solrDoc = new SolrInputDocument();
for (Map.Entry<String, Object> e : doc.entrySet()) solrDoc.addField(e.getKey(),e.getValue());
UpdateRequestProcessorChain processorChain = req.getCore().getUpdateProcessingChain(req.getParams().get(UpdateParams.UPDATE_CHAIN));
- UpdateRequestProcessor processor = processorChain.createProcessor(req,null);
+ UpdateRequestProcessor processor = processorChain.createProcessor(req, rsp);
AddUpdateCommand cmd = new AddUpdateCommand(req);
cmd.solrDoc = solrDoc;
+ log.info("Adding doc "+doc);
processor.processAdd(cmd);
- processorChain.createProcessor(req,null).processCommit(new CommitUpdateCommand(req,false));
-
+ log.info("committing doc"+doc);
+ processor.processCommit(new CommitUpdateCommand(req, false));
}
@Override
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java?rev=1650252&r1=1650251&r2=1650252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java Thu Jan 8 11:07:43 2015
@@ -46,6 +46,7 @@ import java.io.IOException;
import java.io.StringReader;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
+import java.text.MessageFormat;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -128,8 +129,9 @@ public class TestBlobHandler extends Abs
String url;
Map map = null;
List l;
-
- for(int i=0;i<100;i++) {//10secs
+ long start = System.currentTimeMillis();
+ int i=0;
+ for(;i<150;i++) {//10secs
url = baseUrl + "/.system/blob/test";
map = TestSolrConfigHandlerConcurrent.getAsMap(url, cloudClient);
String numFound = String.valueOf(ConfigOverlay.getObjectByPath(map, false, Arrays.asList("response", "numFound")));
@@ -143,7 +145,8 @@ public class TestBlobHandler extends Abs
assertEquals("" + bytes.limit(), String.valueOf(map.get("size")));
return;
}
- fail("Could not successfully add blob " + getAsString(map));
+ fail(MessageFormat.format("Could not successfully add blob after {0} attempts. Expecting {1} items. time elapsed {2} output for url is {3}",
+ i,count, System.currentTimeMillis()-start, getAsString(map)));
}
public static String getAsString(Map map) {