Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-14731: Rename @SolrSingleThreaded to @SolrThreadUnsafe, mark DistribPackageStore with the annotation 

Co-authored-by: Marcus <marcuseagan@gmail.com>
This commit is contained in:
Ishan Chattopadhyaya 2020-08-18 16:21:38 +05:30
parent 4fed9ff8d3
commit 77a4d495cc
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -207,6 +207,9 @@ Other Changes
* SOLR-14641: PeerSync, remove canHandleVersionRanges check (Cao Manh Dat)
* SOLR-14731: Rename @SolrSingleThreaded to @SolrThreadUnsafe, mark DistribPackageStore with the annotation
(marcussorealheis)
================== 8.6.1 ==================
Bug Fixes

5
solr/core/src/java/org/apache/solr/filestore/DistribPackageStore.java
View File

@ -47,6 +47,7 @@ import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.Utils;
import org.apache.solr.common.annotation.SolrThreadUnsafe;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.filestore.PackageStoreAPI.MetaData;
import org.apache.solr.util.SimplePostTool;
@ -60,7 +61,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.solr.common.SolrException.ErrorCode.BAD_REQUEST;
import static org.apache.solr.common.SolrException.ErrorCode.SERVER_ERROR;
@SolrThreadUnsafe
public class DistribPackageStore implements PackageStore {
static final long MAX_PKG_SIZE = Long.parseLong(System.getProperty("max.file.store.size", String.valueOf(100 * 1024 * 1024)));
/**
@ -636,4 +637,4 @@ public class DistribPackageStore implements PackageStore {
log.error("", e);
}
}
}
}

4
solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
View File

@ -38,7 +38,7 @@ import org.apache.solr.client.solrj.util.AsyncListener;
import org.apache.solr.cloud.CloudDescriptor;
import org.apache.solr.cloud.ZkController;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.annotation.SolrSingleThreaded;
import org.apache.solr.common.annotation.SolrThreadUnsafe;
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.ZkCoreNodeProps;
import org.apache.solr.common.params.CommonParams;
@ -52,7 +52,7 @@ import org.apache.solr.request.SolrRequestInfo;
import org.apache.solr.util.tracing.GlobalTracer;
import org.apache.solr.util.tracing.SolrRequestCarrier;
@SolrSingleThreaded
@SolrThreadUnsafe
public class HttpShardHandler extends ShardHandler {
/**
* If the request context map has an entry with this key and Boolean.TRUE as value,

2
solr/solrj/src/java/org/apache/solr/common/annotation/SolrSingleThreaded.java → solr/solrj/src/java/org/apache/solr/common/annotation/SolrThreadUnsafe.java
View File

@ -29,6 +29,6 @@ import java.lang.annotation.Target;
@Documented
@Retention(SOURCE)
@Target(TYPE)
public @interface SolrSingleThreaded {
public @interface SolrThreadUnsafe {
}