You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2016/08/27 19:12:00 UTC
[1/2] lucene-solr:branch_6x: SOLR-9445: Fix failures in
TestLocalFSCloudBackupRestore due to changed code path which return
SolrExceptions instead of SolrServerExceptions (cherry picked from commit
df9a642)
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 545ce3871 -> d4954dad2
SOLR-9445: Fix failures in TestLocalFSCloudBackupRestore due to changed code path which return SolrExceptions instead of SolrServerExceptions
(cherry picked from commit df9a642)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7cf7bfdf
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7cf7bfdf
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7cf7bfdf
Branch: refs/heads/branch_6x
Commit: 7cf7bfdf0c90e56979db0b5a06aabacadd3ee9b4
Parents: 545ce38
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Sun Aug 28 00:38:53 2016 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Sun Aug 28 00:40:45 2016 +0530
----------------------------------------------------------------------
.../solr/cloud/AbstractCloudBackupRestoreTestCase.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7cf7bfdf/solr/core/src/test/org/apache/solr/cloud/AbstractCloudBackupRestoreTestCase.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/AbstractCloudBackupRestoreTestCase.java b/solr/core/src/test/org/apache/solr/cloud/AbstractCloudBackupRestoreTestCase.java
index fd74eaf..8e7a4b0 100644
--- a/solr/core/src/test/org/apache/solr/cloud/AbstractCloudBackupRestoreTestCase.java
+++ b/solr/core/src/test/org/apache/solr/cloud/AbstractCloudBackupRestoreTestCase.java
@@ -33,6 +33,7 @@ import org.apache.solr.client.solrj.impl.HttpSolrClient.RemoteSolrException;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.CollectionAdminRequest.ClusterProp;
import org.apache.solr.client.solrj.response.RequestStatusState;
+import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.cloud.DocCollection;
@@ -147,9 +148,8 @@ public abstract class AbstractCloudBackupRestoreTestCase extends SolrCloudTestCa
try {
backup.process(solrClient);
fail("This request should have failed since the cluster property value for backup location property is invalid.");
- } catch (SolrServerException ex) {
- assertTrue(ex.getCause() instanceof RemoteSolrException);
- assertEquals(ErrorCode.SERVER_ERROR.code, ((RemoteSolrException)ex.getCause()).code());
+ } catch (SolrException ex) {
+ assertEquals(ErrorCode.SERVER_ERROR.code, ex.code());
}
String restoreCollectionName = collectionName + "_invalidrequest";
@@ -158,9 +158,8 @@ public abstract class AbstractCloudBackupRestoreTestCase extends SolrCloudTestCa
try {
restore.process(solrClient);
fail("This request should have failed since the cluster property value for backup location property is invalid.");
- } catch (SolrServerException ex) {
- assertTrue(ex.getCause() instanceof RemoteSolrException);
- assertEquals(ErrorCode.SERVER_ERROR.code, ((RemoteSolrException)ex.getCause()).code());
+ } catch (SolrException ex) {
+ assertEquals(ErrorCode.SERVER_ERROR.code, ex.code());
}
}
[2/2] lucene-solr:branch_6x: SOLR-9445: Removed unused import (cherry
picked from commit 4f316bc)
Posted by sh...@apache.org.
SOLR-9445: Removed unused import
(cherry picked from commit 4f316bc)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d4954dad
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d4954dad
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d4954dad
Branch: refs/heads/branch_6x
Commit: d4954dad23240a518c9d5f0832ad500d6e2bef09
Parents: 7cf7bfd
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Sun Aug 28 00:39:46 2016 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Sun Aug 28 00:40:51 2016 +0530
----------------------------------------------------------------------
.../org/apache/solr/cloud/AbstractCloudBackupRestoreTestCase.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d4954dad/solr/core/src/test/org/apache/solr/cloud/AbstractCloudBackupRestoreTestCase.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/AbstractCloudBackupRestoreTestCase.java b/solr/core/src/test/org/apache/solr/cloud/AbstractCloudBackupRestoreTestCase.java
index 8e7a4b0..c7b2745 100644
--- a/solr/core/src/test/org/apache/solr/cloud/AbstractCloudBackupRestoreTestCase.java
+++ b/solr/core/src/test/org/apache/solr/cloud/AbstractCloudBackupRestoreTestCase.java
@@ -29,7 +29,6 @@ import org.apache.lucene.util.TestUtil;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
-import org.apache.solr.client.solrj.impl.HttpSolrClient.RemoteSolrException;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.CollectionAdminRequest.ClusterProp;
import org.apache.solr.client.solrj.response.RequestStatusState;