Skip to content

Commit 157df9a

Browse files
committed
revert unecesary changes
1 parent 117a7a2 commit 157df9a

File tree

9 files changed

+96
-56
lines changed

9 files changed

+96
-56
lines changed

common/worker_versioning/worker_versioning.go

Lines changed: 54 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,9 @@ func DeploymentVersionFromDeployment(deployment *deploymentpb.Deployment) *deplo
252252
}
253253
}
254254

255-
// WorkerDeploymentVersionFromDeployment Temporary helper function to convert Deployment to
255+
// ExternalWorkerDeploymentVersionFromDeployment Temporary helper function to convert Deployment to
256256
// WorkerDeploymentVersion proto until we update code to use the new proto in all places.
257-
func WorkerDeploymentVersionFromDeployment(deployment *deploymentpb.Deployment) *deploymentpb.WorkerDeploymentVersion {
257+
func ExternalWorkerDeploymentVersionFromDeployment(deployment *deploymentpb.Deployment) *deploymentpb.WorkerDeploymentVersion {
258258
if deployment == nil {
259259
return nil
260260
}
@@ -264,6 +264,30 @@ func WorkerDeploymentVersionFromDeployment(deployment *deploymentpb.Deployment)
264264
}
265265
}
266266

267+
// ExternalWorkerDeploymentVersionFromVersion Temporary helper function to convert internal Worker Deployment to
268+
// WorkerDeploymentVersion proto until we update code to use the new proto in all places.
269+
func ExternalWorkerDeploymentVersionFromVersion(version *deploymentpb.WorkerDeploymentVersion) *deploymentpb.WorkerDeploymentVersion {
270+
if version == nil {
271+
return nil
272+
}
273+
return &deploymentpb.WorkerDeploymentVersion{
274+
BuildId: version.GetBuildId(),
275+
DeploymentName: version.GetDeploymentName(),
276+
}
277+
}
278+
279+
// DeploymentFromExternalDeploymentVersion Temporary helper function to convert WorkerDeploymentVersion to
280+
// Deployment proto until we update code to use the new proto in all places.
281+
func DeploymentFromExternalDeploymentVersion(dv *deploymentpb.WorkerDeploymentVersion) *deploymentpb.Deployment {
282+
if dv == nil {
283+
return nil
284+
}
285+
return &deploymentpb.Deployment{
286+
BuildId: dv.GetBuildId(),
287+
SeriesName: dv.GetDeploymentName(),
288+
}
289+
}
290+
267291
// DeploymentFromDeploymentVersion Temporary helper function to convert WorkerDeploymentVersion to
268292
// Deployment proto until we update code to use the new proto in all places.
269293
func DeploymentFromDeploymentVersion(dv *deploymentpb.WorkerDeploymentVersion) *deploymentpb.Deployment {
@@ -338,7 +362,7 @@ func ValidateDeploymentVersionString(version string) (*deploymentpb.WorkerDeploy
338362
if version == "" {
339363
return nil, serviceerror.NewInvalidArgument("version is required")
340364
}
341-
v, err := WorkerDeploymentVersionFromStringWithError(version)
365+
v, err := WorkerDeploymentVersionFromString(version)
342366
if err != nil {
343367
return nil, serviceerror.NewInvalidArgumentf("invalid version string %q, expected format is \"<deployment_name>.<build_id>\"", version)
344368
}
@@ -529,13 +553,13 @@ func AddV31VersioningInfoToV32(info *workflowpb.WorkflowExecutionVersioningInfo)
529553
//nolint:staticcheck // SA1019: worker versioning v0.31
530554
if info.Version == "" && info.DeploymentVersion != nil {
531555
//nolint:staticcheck // SA1019: worker versioning v0.31
532-
info.Version = WorkerDeploymentVersionToString(info.DeploymentVersion)
556+
info.Version = ExternalWorkerDeploymentVersionToString(info.DeploymentVersion)
533557
}
534558
if t := info.VersionTransition; t != nil {
535559
//nolint:staticcheck // SA1019: worker versioning v0.31
536560
if t.Version == "" {
537561
//nolint:staticcheck // SA1019: worker versioning v0.31
538-
t.Version = WorkerDeploymentVersionToString(t.DeploymentVersion)
562+
t.Version = ExternalWorkerDeploymentVersionToString(t.DeploymentVersion)
539563
}
540564
}
541565
if o := info.VersioningOverride; o != nil {
@@ -548,7 +572,7 @@ func AddV31VersioningInfoToV32(info *workflowpb.WorkflowExecutionVersioningInfo)
548572
//nolint:staticcheck // SA1019: worker versioning v0.31
549573
o.Behavior = enumspb.VERSIONING_BEHAVIOR_PINNED
550574
//nolint:staticcheck // SA1019: worker versioning v0.31
551-
o.PinnedVersion = WorkerDeploymentVersionToString(o.GetPinned().GetVersion())
575+
o.PinnedVersion = ExternalWorkerDeploymentVersionToString(o.GetPinned().GetVersion())
552576
}
553577
}
554578
}
@@ -579,10 +603,10 @@ func ConvertOverrideToV32(override *workflowpb.VersioningOverride) *workflowpb.V
579603
//nolint:staticcheck // SA1019: worker versioning v0.31
580604
if override.GetPinnedVersion() != "" {
581605
//nolint:staticcheck // SA1019: worker versioning v0.31
582-
ret.GetPinned().Version = WorkerDeploymentVersionFromString(override.GetPinnedVersion())
606+
ret.GetPinned().Version = ExternalWorkerDeploymentVersionFromString(override.GetPinnedVersion())
583607
} else {
584608
//nolint:staticcheck // SA1019: worker versioning v0.30
585-
ret.GetPinned().Version = WorkerDeploymentVersionFromDeployment(override.GetDeployment())
609+
ret.GetPinned().Version = ExternalWorkerDeploymentVersionFromDeployment(override.GetDeployment())
586610
}
587611
case enumspb.VERSIONING_BEHAVIOR_UNSPECIFIED:
588612
// this won't happen, but if it did, it makes some sense for unspecified behavior to cause a nil override
@@ -594,18 +618,34 @@ func ConvertOverrideToV32(override *workflowpb.VersioningOverride) *workflowpb.V
594618

595619
func WorkerDeploymentVersionToString(v *deploymentpb.WorkerDeploymentVersion) string {
596620
if v == nil {
597-
return UnversionedVersionId
621+
return "__unversioned__"
622+
}
623+
return v.GetDeploymentName() + WorkerDeploymentVersionIdDelimiter + v.GetBuildId()
624+
}
625+
626+
func ExternalWorkerDeploymentVersionToString(v *deploymentpb.WorkerDeploymentVersion) string {
627+
if v == nil {
628+
return "__unversioned__"
598629
}
599630
return v.GetDeploymentName() + WorkerDeploymentVersionIdDelimiter + v.GetBuildId()
600631
}
601632

602-
func WorkerDeploymentVersionFromString(s string) *deploymentpb.WorkerDeploymentVersion {
603-
v, _ := WorkerDeploymentVersionFromStringWithError(s)
604-
return v
633+
func ExternalWorkerDeploymentVersionFromString(s string) *deploymentpb.WorkerDeploymentVersion {
634+
if s == "" { // unset ramp is no longer supported in v32, so all empty version strings will be treated as unversioned.
635+
s = UnversionedVersionId
636+
}
637+
v, _ := WorkerDeploymentVersionFromString(s)
638+
if v == nil {
639+
return nil
640+
}
641+
return &deploymentpb.WorkerDeploymentVersion{
642+
BuildId: v.BuildId,
643+
DeploymentName: v.DeploymentName,
644+
}
605645
}
606646

607-
func WorkerDeploymentVersionFromStringWithError(s string) (*deploymentpb.WorkerDeploymentVersion, error) {
608-
if s == UnversionedVersionId || s == "" { // unset ramp is no longer supported in v32, so all empty version strings will be treated as unversioned.
647+
func WorkerDeploymentVersionFromString(s string) (*deploymentpb.WorkerDeploymentVersion, error) {
648+
if s == "__unversioned__" {
609649
return nil, nil
610650
}
611651
before, after, found := strings.Cut(s, WorkerDeploymentVersionIdDelimiter)

service/frontend/workflow_handler.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3367,7 +3367,7 @@ func (wh *WorkflowHandler) DescribeWorkerDeploymentVersion(ctx context.Context,
33673367
if request.GetVersion() == "" { //nolint:staticcheck // SA1019: worker versioning v0.31
33683368
return nil, serviceerror.NewInvalidArgument("deployment version cannot be empty")
33693369
}
3370-
dv = worker_versioning.WorkerDeploymentVersionFromString(request.GetVersion()) //nolint:staticcheck // SA1019: worker versioning v0.31
3370+
dv, _ = worker_versioning.WorkerDeploymentVersionFromString(request.GetVersion()) //nolint:staticcheck // SA1019: worker versioning v0.31
33713371
}
33723372

33733373
info, err := wh.workerDeploymentClient.DescribeVersion(ctx, namespaceEntry, dv)
@@ -3402,7 +3402,7 @@ func (wh *WorkflowHandler) SetWorkerDeploymentCurrentVersion(ctx context.Context
34023402
}
34033403

34043404
if request.GetBuildId() == "" && request.GetVersion() != "" { //nolint:staticcheck // SA1019: worker versioning v0.31
3405-
dv := worker_versioning.WorkerDeploymentVersionFromString(request.GetVersion()) //nolint:staticcheck // SA1019: worker versioning v0.31
3405+
dv, _ := worker_versioning.WorkerDeploymentVersionFromString(request.GetVersion()) //nolint:staticcheck // SA1019: worker versioning v0.31
34063406
request.BuildId = dv.GetBuildId()
34073407
}
34083408

@@ -3444,7 +3444,7 @@ func (wh *WorkflowHandler) SetWorkerDeploymentRampingVersion(ctx context.Context
34443444
if request.GetBuildId() == "" {
34453445
if request.GetVersion() != "" { //nolint:staticcheck // SA1019: worker versioning v0.31
34463446
// In this case, user is using v0.31 SDK and is setting a ramp
3447-
dv := worker_versioning.WorkerDeploymentVersionFromString(request.GetVersion()) //nolint:staticcheck // SA1019: worker versioning v0.31
3447+
dv, _ := worker_versioning.WorkerDeploymentVersionFromString(request.GetVersion()) //nolint:staticcheck // SA1019: worker versioning v0.31
34483448
request.BuildId = dv.GetBuildId()
34493449
}
34503450
// If Version="", user is either using v0.31 SDK and unsetting a ramp, which means their percent is already 0.
@@ -3543,7 +3543,7 @@ func (wh *WorkflowHandler) DescribeWorkerDeployment(ctx context.Context, request
35433543

35443544
for _, vs := range workerDeploymentInfo.VersionSummaries {
35453545
//nolint:staticcheck // SA1019: worker versioning v0.31
3546-
vs.DeploymentVersion = worker_versioning.WorkerDeploymentVersionFromString(vs.Version)
3546+
vs.DeploymentVersion, _ = worker_versioning.WorkerDeploymentVersionFromString(vs.Version)
35473547
}
35483548
return &workflowservice.DescribeWorkerDeploymentResponse{
35493549
WorkerDeploymentInfo: workerDeploymentInfo,
@@ -3591,7 +3591,7 @@ func (wh *WorkflowHandler) DeleteWorkerDeploymentVersion(ctx context.Context, re
35913591
if request.GetVersion() == "" { //nolint:staticcheck // SA1019: worker versioning v0.31
35923592
return nil, serviceerror.NewInvalidArgument("deployment version cannot be empty")
35933593
}
3594-
request.DeploymentVersion = worker_versioning.WorkerDeploymentVersionFromString(request.GetVersion()) //nolint:staticcheck // SA1019: worker versioning v0.31
3594+
request.DeploymentVersion, _ = worker_versioning.WorkerDeploymentVersionFromString(request.GetVersion()) //nolint:staticcheck // SA1019: worker versioning v0.31
35953595
}
35963596

35973597
err = wh.workerDeploymentClient.DeleteWorkerDeploymentVersion(ctx, namespaceEntry, request)
@@ -3626,7 +3626,7 @@ func (wh *WorkflowHandler) UpdateWorkerDeploymentVersionMetadata(ctx context.Con
36263626
if request.GetVersion() == "" { //nolint:staticcheck // SA1019: worker versioning v0.31
36273627
return nil, serviceerror.NewInvalidArgument("deployment version cannot be empty")
36283628
}
3629-
request.DeploymentVersion = worker_versioning.WorkerDeploymentVersionFromString(request.GetVersion()) //nolint:staticcheck // SA1019: worker versioning v0.31
3629+
request.DeploymentVersion, _ = worker_versioning.WorkerDeploymentVersionFromString(request.GetVersion()) //nolint:staticcheck // SA1019: worker versioning v0.31
36303630
}
36313631

36323632
updatedMetadata, err := wh.workerDeploymentClient.UpdateVersionMetadata(ctx, namespaceEntry, request)

service/history/historybuilder/event_factory.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ func (b *EventFactory) CreateWorkflowTaskCompletedEvent(
151151
SdkMetadata: sdkMetadata,
152152
MeteringMetadata: meteringMetadata,
153153
WorkerDeploymentName: deploymentName,
154-
DeploymentVersion: worker_versioning.WorkerDeploymentVersionFromDeployment(deployment),
154+
DeploymentVersion: worker_versioning.ExternalWorkerDeploymentVersionFromDeployment(deployment),
155155
VersioningBehavior: behavior,
156156
},
157157
}

service/history/transfer_queue_active_task_executor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,7 @@ func (t *transferQueueActiveTaskExecutor) processStartChildExecution(
893893
if attributes.TaskQueue.GetName() == mutableState.GetExecutionInfo().GetTaskQueue() {
894894
// TODO (shahab): also inherit when the child TQ is different, but in the same Version
895895
if mutableState.GetEffectiveVersioningBehavior() == enumspb.VERSIONING_BEHAVIOR_PINNED {
896-
parentPinnedDeploymentVersion = worker_versioning.WorkerDeploymentVersionFromDeployment(mutableState.GetEffectiveDeployment())
896+
parentPinnedDeploymentVersion = worker_versioning.ExternalWorkerDeploymentVersionFromDeployment(mutableState.GetEffectiveDeployment())
897897
}
898898
if worker_versioning.OverrideIsPinned(mutableState.GetExecutionInfo().GetVersioningInfo().GetVersioningOverride()) {
899899
parentPinnedOverride = mutableState.GetExecutionInfo().GetVersioningInfo().GetVersioningOverride()

service/history/workflow/mutable_state_impl.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2561,7 +2561,7 @@ func (ms *MutableStateImpl) ApplyWorkflowExecutionStartedEvent(
25612561
if event.ParentPinnedWorkerDeploymentVersion != "" || event.ParentPinnedDeploymentVersion != nil {
25622562
parentPinned := event.ParentPinnedDeploymentVersion
25632563
if parentPinned == nil {
2564-
parentPinned = worker_versioning.WorkerDeploymentVersionFromString(event.ParentPinnedWorkerDeploymentVersion) //nolint:staticcheck // SA1019: worker versioning v0.31
2564+
parentPinned = worker_versioning.ExternalWorkerDeploymentVersionFromString(event.ParentPinnedWorkerDeploymentVersion) //nolint:staticcheck // SA1019: worker versioning v0.31
25652565
}
25662566
ms.executionInfo.VersioningInfo = &workflowpb.WorkflowExecutionVersioningInfo{
25672567
Behavior: enumspb.VERSIONING_BEHAVIOR_PINNED,
@@ -2636,7 +2636,7 @@ func (ms *MutableStateImpl) ApplyWorkflowExecutionStartedEvent(
26362636
ms.executionInfo.VersioningInfo.VersioningOverride.Override = &workflowpb.VersioningOverride_Pinned{
26372637
Pinned: &workflowpb.VersioningOverride_PinnedOverride{
26382638
Behavior: workflowpb.VersioningOverride_PINNED_OVERRIDE_BEHAVIOR_PINNED,
2639-
Version: worker_versioning.WorkerDeploymentVersionFromDeployment(d),
2639+
Version: worker_versioning.ExternalWorkerDeploymentVersionFromDeployment(d),
26402640
},
26412641
}
26422642
ms.executionInfo.VersioningInfo.VersioningOverride.Deployment = nil
@@ -2648,7 +2648,7 @@ func (ms *MutableStateImpl) ApplyWorkflowExecutionStartedEvent(
26482648
ms.executionInfo.VersioningInfo.VersioningOverride.Override = &workflowpb.VersioningOverride_Pinned{
26492649
Pinned: &workflowpb.VersioningOverride_PinnedOverride{
26502650
Behavior: workflowpb.VersioningOverride_PINNED_OVERRIDE_BEHAVIOR_PINNED,
2651-
Version: worker_versioning.WorkerDeploymentVersionFromString(vs),
2651+
Version: worker_versioning.ExternalWorkerDeploymentVersionFromString(vs),
26522652
},
26532653
}
26542654
//nolint:staticcheck // SA1019: worker versioning v0.31
@@ -3530,7 +3530,7 @@ func (ms *MutableStateImpl) AddActivityTaskStartedEvent(
35303530

35313531
if deployment != nil {
35323532
ai.LastWorkerDeploymentVersion = worker_versioning.WorkerDeploymentVersionToString(worker_versioning.DeploymentVersionFromDeployment(deployment))
3533-
ai.LastDeploymentVersion = worker_versioning.WorkerDeploymentVersionFromDeployment(deployment)
3533+
ai.LastDeploymentVersion = worker_versioning.ExternalWorkerDeploymentVersionFromDeployment(deployment)
35343534
}
35353535

35363536
if !ai.HasRetryPolicy {
@@ -4884,7 +4884,7 @@ func (ms *MutableStateImpl) updateVersioningOverride(
48844884
ms.GetExecutionInfo().VersioningInfo.VersioningOverride.Override = &workflowpb.VersioningOverride_Pinned{
48854885
Pinned: &workflowpb.VersioningOverride_PinnedOverride{
48864886
//nolint:staticcheck // SA1019: worker versioning v0.31
4887-
Version: worker_versioning.WorkerDeploymentVersionFromString(override.GetPinnedVersion()),
4887+
Version: worker_versioning.ExternalWorkerDeploymentVersionFromString(override.GetPinnedVersion()),
48884888
Behavior: workflowpb.VersioningOverride_PINNED_OVERRIDE_BEHAVIOR_PINNED,
48894889
},
48904890
}
@@ -4905,7 +4905,7 @@ func (ms *MutableStateImpl) updateVersioningOverride(
49054905
ms.GetExecutionInfo().VersioningInfo.VersioningOverride.Override = &workflowpb.VersioningOverride_Pinned{
49064906
Pinned: &workflowpb.VersioningOverride_PinnedOverride{
49074907
Behavior: workflowpb.VersioningOverride_PINNED_OVERRIDE_BEHAVIOR_PINNED,
4908-
Version: worker_versioning.WorkerDeploymentVersionFromDeployment(d),
4908+
Version: worker_versioning.ExternalWorkerDeploymentVersionFromDeployment(d),
49094909
},
49104910
}
49114911
}
@@ -4916,7 +4916,7 @@ func (ms *MutableStateImpl) updateVersioningOverride(
49164916
ms.GetExecutionInfo().VersioningInfo.VersioningOverride.Override = &workflowpb.VersioningOverride_Pinned{
49174917
Pinned: &workflowpb.VersioningOverride_PinnedOverride{
49184918
Behavior: workflowpb.VersioningOverride_PINNED_OVERRIDE_BEHAVIOR_PINNED,
4919-
Version: worker_versioning.WorkerDeploymentVersionFromString(vs),
4919+
Version: worker_versioning.ExternalWorkerDeploymentVersionFromString(vs),
49204920
},
49214921
}
49224922
}
@@ -8029,7 +8029,7 @@ func (ms *MutableStateImpl) GetWorkerDeploymentSA() string {
80298029
}
80308030
//nolint:staticcheck // SA1019: worker versioning v0.31
80318031
if vs := override.GetPinnedVersion(); vs != "" {
8032-
v := worker_versioning.WorkerDeploymentVersionFromString(vs)
8032+
v, _ := worker_versioning.WorkerDeploymentVersionFromString(vs)
80338033
return v.GetDeploymentName()
80348034
}
80358035
//nolint:staticcheck // SA1019: worker versioning v0.30
@@ -8043,7 +8043,7 @@ func (ms *MutableStateImpl) GetWorkerDeploymentVersionSA() string {
80438043
if override := versioningInfo.GetVersioningOverride(); override != nil &&
80448044
worker_versioning.OverrideIsPinned(override) {
80458045
if v := override.GetPinned().GetVersion(); v != nil {
8046-
return worker_versioning.WorkerDeploymentVersionToString(v)
8046+
return worker_versioning.ExternalWorkerDeploymentVersionToString(v)
80478047
}
80488048
//nolint:staticcheck // SA1019: worker versioning v0.31
80498049
if vs := override.GetPinnedVersion(); vs != "" {
@@ -8053,7 +8053,7 @@ func (ms *MutableStateImpl) GetWorkerDeploymentVersionSA() string {
80538053
return worker_versioning.DeploymentToString(override.GetDeployment())
80548054
}
80558055
if v := versioningInfo.GetDeploymentVersion(); v != nil {
8056-
return worker_versioning.WorkerDeploymentVersionToString(v)
8056+
return worker_versioning.ExternalWorkerDeploymentVersionToString(v)
80578057
}
80588058
//nolint:staticcheck // SA1019: worker versioning v0.31
80598059
return versioningInfo.GetVersion()
@@ -8078,10 +8078,10 @@ func (ms *MutableStateImpl) GetDeploymentTransition() *workflowpb.DeploymentTran
80788078
//nolint:staticcheck // SA1019: worker versioning v0.30
80798079
ret := &workflowpb.DeploymentTransition{}
80808080
if dv := t.GetDeploymentVersion(); dv != nil {
8081-
ret.Deployment = worker_versioning.DeploymentFromDeploymentVersion(dv)
8081+
ret.Deployment = worker_versioning.DeploymentFromExternalDeploymentVersion(dv)
80828082
} else {
80838083
//nolint:staticcheck // SA1019: worker versioning v0.31
8084-
v := worker_versioning.WorkerDeploymentVersionFromString(t.GetVersion())
8084+
v, _ := worker_versioning.WorkerDeploymentVersionFromString(t.GetVersion())
80858085
ret.Deployment = worker_versioning.DeploymentFromDeploymentVersion(v)
80868086
}
80878087
return ret
@@ -8134,7 +8134,7 @@ func (ms *MutableStateImpl) StartDeploymentTransition(deployment *deploymentpb.D
81348134
versioningInfo.DeploymentTransition = nil
81358135
versioningInfo.VersionTransition = &workflowpb.DeploymentVersionTransition{
81368136
// [cleanup-wv-3.1]
8137-
DeploymentVersion: worker_versioning.WorkerDeploymentVersionFromDeployment(deployment),
8137+
DeploymentVersion: worker_versioning.ExternalWorkerDeploymentVersionFromDeployment(deployment),
81388138
}
81398139

81408140
// Because deployment is changed, we clear sticky queue to make sure the next wf task does not
@@ -8167,8 +8167,8 @@ func (ms *MutableStateImpl) StartDeploymentTransition(deployment *deploymentpb.D
81678167
metrics.StartDeploymentTransitionCounter.With(
81688168
ms.metricsHandler.WithTags(
81698169
metrics.NamespaceTag(ms.namespaceEntry.Name().String()),
8170-
metrics.FromUnversionedTag(worker_versioning.WorkerDeploymentVersionToString(worker_versioning.WorkerDeploymentVersionFromDeployment(preTransitionEffectiveDeployment))),
8171-
metrics.ToUnversionedTag(worker_versioning.WorkerDeploymentVersionToString(worker_versioning.WorkerDeploymentVersionFromDeployment(deployment))),
8170+
metrics.FromUnversionedTag(worker_versioning.ExternalWorkerDeploymentVersionToString(worker_versioning.ExternalWorkerDeploymentVersionFromDeployment(preTransitionEffectiveDeployment))),
8171+
metrics.ToUnversionedTag(worker_versioning.ExternalWorkerDeploymentVersionToString(worker_versioning.ExternalWorkerDeploymentVersionFromDeployment(deployment))),
81728172
),
81738173
).Record(1)
81748174

0 commit comments

Comments
 (0)