Merge branch 'master' into input_size_seal

uber-archive · Feb 17, 2017 · 7dcd260 · 7dcd260
2 parents 2f624ab + d9b381a
commit 7dcd260
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/services/replicator/metadataReconciler.go b/services/replicator/metadataReconciler.go
@@ -71,7 +71,7 @@ const (
 	runInterval                    = time.Duration(10 * time.Minute)
 	metadataListRequestPageSize    = 50
 	storeCallTimeout               = 10 * time.Second
-	extentMissingDurationThreshold = time.Duration(24 * time.Hour)
+	extentMissingDurationThreshold = time.Duration(1 * time.Hour)
 )
 
 // NewMetadataReconciler returns an instance of MetadataReconciler
@@ -621,7 +621,7 @@ func (r *metadataReconciler) sealExtentInStore(destUUID string, extentUUID strin
 
 	var errorOccured bool
 	for _, store := range readExtentResult.GetExtentStats().GetExtent().GetStoreUUIDs() {
-		storeClient, _, err := r.replicator.clientFactory.GetThriftStoreClientUUID(store, destUUID)
+		storeClient, _, err := r.replicator.GetClientFactory().GetThriftStoreClientUUID(store, destUUID)
 		if err != nil {
 			lclLg.WithFields(bark.Fields{
 				common.TagErr:  err,

diff --git a/services/replicator/replicator.go b/services/replicator/replicator.go
@@ -61,7 +61,6 @@ type (
 		tenancy                   string
 		defaultAuthoritativeZone  string
 		replicatorclientFactory   ClientFactory
-		clientFactory             common.ClientFactory
 		remoteReplicatorConn      map[string]*outConnection
 		remoteReplicatorConnMutex sync.RWMutex
 		storehostConn             map[string]*outConnection
@@ -123,7 +122,6 @@ func NewReplicator(serviceName string, sVice common.SCommon, metadataClient meta
 		defaultAuthoritativeZone: config.GetReplicatorConfig().GetDefaultAuthoritativeZone(),
 		tenancy:                  tenancy,
 		replicatorclientFactory:  replicatorClientFactory,
-		clientFactory:            sVice.GetClientFactory(),
 		remoteReplicatorConn:     make(map[string]*outConnection),
 		storehostConn:            make(map[string]*outConnection),
 	}