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 2017/08/31 13:14:23 UTC
lucene-solr:branch_7x: SOLR-11293: Potential data loss in TLOG
replicas after replication failures
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 9a9f986eb -> a72f9aba5
SOLR-11293: Potential data loss in TLOG replicas after replication failures
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a72f9aba
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a72f9aba
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a72f9aba
Branch: refs/heads/branch_7x
Commit: a72f9aba54f20849e915265a9596e3cc34c092b4
Parents: 9a9f986
Author: Noble Paul <no...@apache.org>
Authored: Thu Aug 31 22:42:19 2017 +0930
Committer: Noble Paul <no...@apache.org>
Committed: Thu Aug 31 22:44:05 2017 +0930
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../org/apache/solr/cloud/ReplicateFromLeader.java | 1 -
.../src/java/org/apache/solr/cloud/ZkController.java | 2 +-
.../src/java/org/apache/solr/update/UpdateLog.java | 13 +++++++------
.../test/org/apache/solr/cloud/HttpPartitionTest.java | 2 ++
5 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a72f9aba/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0666db1..b9e78c5 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -98,6 +98,8 @@ Bug Fixes
* SOLR-11278: Stopping CDCR should cancel a running bootstrap operation. (Amrit Sarkar, shalin)
+* SOLR-11293: Potential data loss in TLOG replicas after replication failures (noble)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a72f9aba/solr/core/src/java/org/apache/solr/cloud/ReplicateFromLeader.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ReplicateFromLeader.java b/solr/core/src/java/org/apache/solr/cloud/ReplicateFromLeader.java
index d0de6ae..549ef70 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ReplicateFromLeader.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ReplicateFromLeader.java
@@ -89,7 +89,6 @@ public class ReplicateFromLeader {
if (pollSuccess) {
String commitVersion = getCommitVersion(core);
if (commitVersion == null) return;
- if (Long.parseLong(commitVersion) == lastVersion) return;
UpdateLog updateLog = solrCore.getUpdateHandler().getUpdateLog();
SolrQueryRequest req = new LocalSolrQueryRequest(core,
new ModifiableSolrParams());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a72f9aba/solr/core/src/java/org/apache/solr/cloud/ZkController.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index 491808e..c79390c 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -989,7 +989,7 @@ public class ZkController {
if (isTlogReplicaAndNotLeader) {
String commitVersion = ReplicateFromLeader.getCommitVersion(core);
if (commitVersion != null) {
- ulog.copyOverOldUpdates(Long.parseLong(commitVersion));
+ ulog.copyOverOldUpdates(Long.parseLong(commitVersion), true);
}
}
// we will call register again after zk expiration and on reload
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a72f9aba/solr/core/src/java/org/apache/solr/update/UpdateLog.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/UpdateLog.java b/solr/core/src/java/org/apache/solr/update/UpdateLog.java
index c84a9a6..5a16cd4 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateLog.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateLog.java
@@ -1158,10 +1158,12 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {
protected void copyAndSwitchToNewTlog(CommitUpdateCommand cuc) {
synchronized (this) {
- if (tlog == null) return;
+ if (tlog == null && prevTlog == null && prevMapLog2 == null && logs.isEmpty()) {
+ return;
+ }
preCommit(cuc);
try {
- copyOverOldUpdates(cuc.getVersion());
+ copyOverOldUpdates(cuc.getVersion(), false);
} finally {
postCommit(cuc);
}
@@ -1171,8 +1173,9 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {
/**
* Copy over updates from prevTlog or last tlog (in tlog folder) to a new tlog
* @param commitVersion any updates that have version larger than the commitVersion will be copied over
+ * @param omitCommitted if a tlog is already committed then don't read it
*/
- public void copyOverOldUpdates(long commitVersion) {
+ public void copyOverOldUpdates(long commitVersion, boolean omitCommitted) {
TransactionLog oldTlog = prevTlog;
if (oldTlog == null && !logs.isEmpty()) {
oldTlog = logs.getFirst();
@@ -1182,9 +1185,7 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {
}
try {
- if (oldTlog.endsWithCommit()) {
- return;
- }
+ if (omitCommitted && oldTlog.endsWithCommit()) return;
} catch (IOException e) {
log.warn("Exception reading log", e);
return;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a72f9aba/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
index 0a56e76..95c2245 100644
--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
@@ -220,6 +220,7 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {
assertDocsExistInAllReplicas(notLeaders, testCollectionName, 1, 1);
// Now introduce a network partition between the leader and 1 replica, so a minRf of 2 is still achieved
+ log.info("partitioning replica : " + notLeaders.get(0));
SocketProxy proxy0 = getProxyForReplica(notLeaders.get(0));
proxy0.close();
@@ -239,6 +240,7 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {
Replica partitionedReplica = slice.getReplica(notLeaders.get(0).getName());
assertEquals("The partitioned replica did not get marked down",
Replica.State.DOWN.toString(), partitionedReplica.getStr(ZkStateReader.STATE_PROP));
+ log.info("un-partitioning replica : " + notLeaders.get(0));
proxy0.reopen();