Use namespace Id for replication APIs (#2914)

temporalio · May 27, 2022 · 3dbabab · 3dbabab
1 parent a7e3520
commit 3dbabab
Show file tree

Hide file tree

Showing 20 changed files with 626 additions and 289 deletions.
diff --git a/api/adminservice/v1/request_response.pb.go b/api/adminservice/v1/request_response.pb.go
diff --git a/api/adminservice/v1/service.pb.go b/api/adminservice/v1/service.pb.go
diff --git a/api/token/v1/message.pb.go b/api/token/v1/message.pb.go
diff --git a/common/rpc/interceptor/namespace_validator.go b/common/rpc/interceptor/namespace_validator.go
@@ -33,6 +33,7 @@ import (
 	"go.temporal.io/api/workflowservice/v1"
 	"google.golang.org/grpc"
 
+	"go.temporal.io/server/api/adminservice/v1"
 	"go.temporal.io/server/common"
 	"go.temporal.io/server/common/dynamicconfig"
 	"go.temporal.io/server/common/namespace"
@@ -160,6 +161,31 @@ func (ni *NamespaceValidatorInterceptor) extractNamespaceFromRequest(req interfa
 			return nil, ErrNamespaceNotSet
 		}
 		return nil, nil
+	// TODO (alex): remove 3 below cases in 1.18+ together with `namespace` field in corresponding protos.
+	case *adminservice.GetWorkflowExecutionRawHistoryV2Request:
+		if request.GetNamespaceId() != "" {
+			return ni.namespaceRegistry.GetNamespaceByID(namespace.ID(request.GetNamespaceId()))
+		}
+		if namespaceName.IsEmpty() {
+			return nil, ErrNamespaceNotSet
+		}
+		return ni.namespaceRegistry.GetNamespace(namespaceName)
+	case *adminservice.ReapplyEventsRequest:
+		if request.GetNamespaceId() != "" {
+			return ni.namespaceRegistry.GetNamespaceByID(namespace.ID(request.GetNamespaceId()))
+		}
+		if namespaceName.IsEmpty() {
+			return nil, ErrNamespaceNotSet
+		}
+		return ni.namespaceRegistry.GetNamespace(namespaceName)
+	case *adminservice.RefreshWorkflowTasksRequest:
+		if request.GetNamespaceId() != "" {
+			return ni.namespaceRegistry.GetNamespaceByID(namespace.ID(request.GetNamespaceId()))
+		}
+		if namespaceName.IsEmpty() {
+			return nil, ErrNamespaceNotSet
+		}
+		return ni.namespaceRegistry.GetNamespace(namespaceName)
 	default:
 		// All other APIs.
 		if namespaceName.IsEmpty() {

diff --git a/common/xdc/nDCHistoryResender.go b/common/xdc/nDCHistoryResender.go
@@ -265,12 +265,10 @@ func (n *NDCHistoryResenderImpl) getHistory(
 
 	logger := log.With(n.logger, tag.WorkflowRunID(runID))
 
-	namespaceEntry, err := n.namespaceRegistry.GetNamespaceByID(namespaceID)
+	ns, err := n.namespaceRegistry.GetNamespaceByID(namespaceID)
 	if err != nil {
-		logger.Error("error getting namespace", tag.Error(err))
 		return nil, err
 	}
-	namespace := namespaceEntry.Name()
 
 	ctx, cancel := rpc.NewContextFromParentWithTimeoutAndHeaders(ctx, resendContextTimeout)
 	defer cancel()
@@ -281,7 +279,8 @@ func (n *NDCHistoryResenderImpl) getHistory(
 	}
 
 	response, err := adminClient.GetWorkflowExecutionRawHistoryV2(ctx, &adminservice.GetWorkflowExecutionRawHistoryV2Request{
-		Namespace: namespace.String(),
+		Namespace:   ns.Name().String(),
+		NamespaceId: namespaceID.String(),
 		Execution: &commonpb.WorkflowExecution{
 			WorkflowId: workflowID,
 			RunId:      runID,

diff --git a/common/xdc/nDCHistoryResender_test.go b/common/xdc/nDCHistoryResender_test.go
@@ -169,7 +169,8 @@ func (s *nDCHistoryResenderSuite) TestSendSingleWorkflowHistory() {
 	s.mockAdminClient.EXPECT().GetWorkflowExecutionRawHistoryV2(
 		gomock.Any(),
 		&adminservice.GetWorkflowExecutionRawHistoryV2Request{
-			Namespace: s.namespace.String(),
+			Namespace:   s.namespace.String(),
+			NamespaceId: s.namespaceID.String(),
 			Execution: &commonpb.WorkflowExecution{
 				WorkflowId: workflowID,
 				RunId:      runID,
@@ -191,7 +192,8 @@ func (s *nDCHistoryResenderSuite) TestSendSingleWorkflowHistory() {
 	s.mockAdminClient.EXPECT().GetWorkflowExecutionRawHistoryV2(
 		gomock.Any(),
 		&adminservice.GetWorkflowExecutionRawHistoryV2Request{
-			Namespace: s.namespace.String(),
+			Namespace:   s.namespace.String(),
+			NamespaceId: s.namespaceID.String(),
 			Execution: &commonpb.WorkflowExecution{
 				WorkflowId: workflowID,
 				RunId:      runID,
@@ -345,7 +347,8 @@ func (s *nDCHistoryResenderSuite) TestGetHistory() {
 		NextPageToken: nextTokenOut,
 	}
 	s.mockAdminClient.EXPECT().GetWorkflowExecutionRawHistoryV2(gomock.Any(), &adminservice.GetWorkflowExecutionRawHistoryV2Request{
-		Namespace: s.namespace.String(),
+		Namespace:   s.namespace.String(),
+		NamespaceId: s.namespaceID.String(),
 		Execution: &commonpb.WorkflowExecution{
 			WorkflowId: workflowID,
 			RunId:      runID,