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 2014/12/24 19:50:31 UTC
svn commit: r1647829 - in
/lucene/dev/trunk/solr/core/src/java/org/apache/solr:
core/RequestParams.java handler/SolrConfigHandler.java
Author: noble
Date: Wed Dec 24 18:50:31 2014
New Revision: 1647829
URL: http://svn.apache.org/r1647829
Log:
SOLR-6770 fixing test failures http://jenkins.thetaphi.de/job/Lucene-Solr-trunk-MacOSX/2013/
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/RequestParams.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/RequestParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/RequestParams.java?rev=1647829&r1=1647828&r2=1647829&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/RequestParams.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/RequestParams.java Wed Dec 24 18:50:31 2014
@@ -129,15 +129,17 @@ public class RequestParams implements Ma
log.info("request params refreshed to version {}",requestParams.getZnodeVersion());
}
} catch (KeeperException e) {
- //todo handle properly
- log.error("",e);
+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);
} catch (InterruptedException e) {
- //todo handle properly
-
- log.error("",e);
+ Thread.currentThread().interrupt();
+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);
}
+ } else if(requestParams == null) {
+ Object[] o = getMapAndVersion(loader, RequestParams.RESOURCE);
+ requestParams = new RequestParams((Map) o[0],(Integer)o[1]);
}
+
return requestParams;
}
@@ -152,16 +154,17 @@ public class RequestParams implements Ma
return new Object[]{Collections.EMPTY_MAP, -1};
}
- try {
int version = 0; //will be always 0 for file based resourceloader
if (in instanceof ZkSolrResourceLoader.ZkByteArrayInputStream) {
version = ((ZkSolrResourceLoader.ZkByteArrayInputStream) in).getStat().getVersion();
log.info( "conf resource {} loaded . version : {} ", name,version);
}
+
+ try {
Map m = (Map) ObjectBuilder.getVal(new JSONParser(new InputStreamReader(in, StandardCharsets.UTF_8)));
return new Object[]{m,version};
- } catch (Exception e) {
- throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,"Error reading conf resource "+name,e);
+ } catch (IOException e) {
+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,"Error parsing conf resource "+name,e);
}
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java?rev=1647829&r1=1647828&r2=1647829&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java Wed Dec 24 18:50:31 2014
@@ -113,9 +113,10 @@ public class SolrConfigHandler extends R
log.info("config update listener called for core {}", coreName);
SolrZkClient zkClient = cc.getZkController().getZkClient();
int solrConfigversion,overlayVersion, managedSchemaVersion=0;
+ SolrConfig cfg = null;
try (SolrCore core = cc.getCore(coreName)) {
if (core.isClosed()) return;
- core.getSolrConfig().refreshRequestParams();
+ cfg = core.getSolrConfig();
solrConfigversion = core.getSolrConfig().getOverlay().getZnodeVersion();
overlayVersion = core.getSolrConfig().getZnodeVersion();
if(managedSchmaResourcePath != null){
@@ -123,6 +124,9 @@ public class SolrConfigHandler extends R
}
}
+ if(cfg != null){
+ cfg.refreshRequestParams();
+ }
if (checkStale(zkClient, overlayPath, solrConfigversion) ||
checkStale(zkClient, solrConfigPath, overlayVersion) ||