[SEARCH-1643]

fixed problem caused by incorrect conflixt resolution in MetadataTracker
This commit is contained in:
eliaporciani
2019-06-03 15:25:07 +02:00
parent 73da6c43e0
commit f1b2e17ead

View File

@@ -228,10 +228,10 @@ public class MetadataTracker extends AbstractTracker implements Tracker
return ShardStateBuilder.shardState()
.withMaster(isMaster)
.withLastUpdated(System.currentTimeMillis())
.withLastIndexedChangeSetCommitTime(state.getLastIndexedChangeSetCommitTime())
.withLastIndexedChangeSetId(state.getLastIndexedChangeSetId())
.withLastIndexedTxCommitTime(state.getLastIndexedTxCommitTime())
.withLastIndexedTxId(state.getLastIndexedTxId())
.withLastIndexedChangeSetCommitTime(changeSetsTrackerState.getLastIndexedChangeSetCommitTime())
.withLastIndexedChangeSetId(changeSetsTrackerState.getLastIndexedChangeSetId())
.withLastIndexedTxCommitTime(transactionsTrackerState.getLastIndexedTxCommitTime())
.withLastIndexedTxId(transactionsTrackerState.getLastIndexedTxId())
.withShardInstance()
.withBaseUrl(infoSrv.getBaseUrl())
.withPort(infoSrv.getPort())