Use new resource struct for history (#2875)

cmd/server/server.go

@@ -212,7 +212,7 @@ func (s *server) startService() common.Daemon {
 	case frontendService:
 		daemon, err = frontend.NewService(&params)
 	case historyService:
-		daemon = history.NewService(&params)
+		daemon, err = history.NewService(&params)
 	case matchingService:
 		daemon, err = matching.NewService(&params)
 	case workerService:

common/membership/interfaces.go

@@ -18,6 +18,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+//go:generate mockgen -copyright_file ../../LICENSE -package $GOPACKAGE -source $GOFILE -destination interface_mock.go
+
 package membership
 
 import (

common/resource/resource.go

@@ -53,7 +53,7 @@ type (
 
 		GetServiceName() string
 		GetHostName() string
-		GetHostInfo() (*membership.HostInfo, error)
+		GetHostInfo() *membership.HostInfo
 		GetArchivalMetadata() archiver.ArchivalMetadata
 		GetClusterMetadata() cluster.Metadata
 

common/resource/resourceImpl.go

@@ -71,6 +71,7 @@ type (
 		numShards       int
 		serviceName     string
 		hostName        string
+		hostInfo        *membership.HostInfo
 		metricsScope    tally.Scope
 		clusterMetadata cluster.Metadata
 
@@ -347,6 +348,12 @@ func (h *Impl) Start() {
 	h.membershipMonitor.Start()
 	h.domainCache.Start()
 
+	hostInfo, err := h.membershipMonitor.WhoAmI()
+	if err != nil {
+		h.logger.WithTags(tag.Error(err)).Fatal("fail to get host info from membership monitor")
+	}
+	h.hostInfo = hostInfo
+
 	// The service is now started up
 	h.logger.Info("service started")
 	// seed the random generator once for this service
@@ -385,8 +392,8 @@ func (h *Impl) GetHostName() string {
 }
 
 // GetHostInfo return host info
-func (h *Impl) GetHostInfo() (*membership.HostInfo, error) {
-	return h.membershipMonitor.WhoAmI()
+func (h *Impl) GetHostInfo() *membership.HostInfo {
+	return h.hostInfo
 }
 
 // GetClusterMetadata return cluster metadata
@@ -440,7 +447,7 @@ func (h *Impl) GetMembershipMonitor() membership.Monitor {
 
 // GetFrontendServiceResolver return frontend service resolver
 func (h *Impl) GetFrontendServiceResolver() membership.ServiceResolver {
-	return h.historyServiceResolver
+	return h.frontendServiceResolver
 }
 
 // GetMatchingServiceResolver return matching service resolver

common/resource/resourceTest.go

@@ -36,6 +36,7 @@ import (
 	"github.com/uber/cadence/client/frontend"
 	"github.com/uber/cadence/client/history"
 	"github.com/uber/cadence/client/matching"
+	"github.com/uber/cadence/common"
 	"github.com/uber/cadence/common/archiver"
 	"github.com/uber/cadence/common/archiver/provider"
 	"github.com/uber/cadence/common/cache"
@@ -71,11 +72,11 @@ type (
 
 		// membership infos
 
-		MembershipMonitor       membership.Monitor
-		FrontendServiceResolver membership.ServiceResolver
-		MatchingServiceResolver membership.ServiceResolver
-		HistoryServiceResolver  membership.ServiceResolver
-		WorkerServiceResolver   membership.ServiceResolver
+		MembershipMonitor       *membership.MockMonitor
+		FrontendServiceResolver *membership.MockServiceResolver
+		MatchingServiceResolver *membership.MockServiceResolver
+		HistoryServiceResolver  *membership.MockServiceResolver
+		WorkerServiceResolver   *membership.MockServiceResolver
 
 		// internal services clients
 
@@ -150,6 +151,16 @@ func NewTest(
 	persistenceBean.EXPECT().GetShardManager().Return(shardMgr).AnyTimes()
 	persistenceBean.EXPECT().GetExecutionManager(gomock.Any()).Return(executionMgr, nil).AnyTimes()
 
+	membershipMonitor := membership.NewMockMonitor(controller)
+	frontendServiceResolver := membership.NewMockServiceResolver(controller)
+	matchingServiceResolver := membership.NewMockServiceResolver(controller)
+	historyServiceResolver := membership.NewMockServiceResolver(controller)
+	workerServiceResolver := membership.NewMockServiceResolver(controller)
+	membershipMonitor.EXPECT().GetResolver(common.FrontendServiceName).Return(frontendServiceResolver, nil).AnyTimes()
+	membershipMonitor.EXPECT().GetResolver(common.MatchingServiceName).Return(matchingServiceResolver, nil).AnyTimes()
+	membershipMonitor.EXPECT().GetResolver(common.HistoryServiceName).Return(historyServiceResolver, nil).AnyTimes()
+	membershipMonitor.EXPECT().GetResolver(common.WorkerServiceName).Return(workerServiceResolver, nil).AnyTimes()
+
 	return &Test{
 		MetricsScope:    tally.NoopScope,
 		ClusterMetadata: cluster.NewMockMetadata(controller),
@@ -165,11 +176,11 @@ func NewTest(
 
 		// membership infos
 
-		MembershipMonitor:       nil,
-		FrontendServiceResolver: nil,
-		MatchingServiceResolver: nil,
-		HistoryServiceResolver:  nil,
-		WorkerServiceResolver:   nil,
+		MembershipMonitor:       membershipMonitor,
+		FrontendServiceResolver: frontendServiceResolver,
+		MatchingServiceResolver: matchingServiceResolver,
+		HistoryServiceResolver:  historyServiceResolver,
+		WorkerServiceResolver:   workerServiceResolver,
 
 		// internal services clients
 
@@ -221,8 +232,8 @@ func (s *Test) GetHostName() string {
 }
 
 // GetHostInfo for testing
-func (s *Test) GetHostInfo() (*membership.HostInfo, error) {
-	return testHostInfo, nil
+func (s *Test) GetHostInfo() *membership.HostInfo {
+	return testHostInfo
 }
 
 // GetClusterMetadata for testing
@@ -271,27 +282,27 @@ func (s *Test) GetArchiverProvider() provider.ArchiverProvider {
 
 // GetMembershipMonitor for testing
 func (s *Test) GetMembershipMonitor() membership.Monitor {
-	panic("user should implement this method for test")
+	return s.MembershipMonitor
 }
 
 // GetFrontendServiceResolver for testing
 func (s *Test) GetFrontendServiceResolver() membership.ServiceResolver {
-	panic("user should implement this method for test")
+	return s.FrontendServiceResolver
 }
 
 // GetMatchingServiceResolver for testing
 func (s *Test) GetMatchingServiceResolver() membership.ServiceResolver {
-	panic("user should implement this method for test")
+	return s.MatchingServiceResolver
 }
 
 // GetHistoryServiceResolver for testing
 func (s *Test) GetHistoryServiceResolver() membership.ServiceResolver {
-	panic("user should implement this method for test")
+	return s.HistoryServiceResolver
 }
 
 // GetWorkerServiceResolver for testing
 func (s *Test) GetWorkerServiceResolver() membership.ServiceResolver {
-	panic("user should implement this method for test")
+	return s.WorkerServiceResolver
 }
 
 // internal services clients