Skip to content

Commit

Permalink
Write sdk flags directly during replay (#1116)
Browse files Browse the repository at this point in the history
If flags are found for a task via lookahead we want those flags to be
written directly into the current flagset and not the new/pending
flagset as residence in the latter is not visible to subsequent callers
of sdkFlags.tryUse.
  • Loading branch information
Matt McShane authored May 22, 2023
1 parent f709720 commit febeb48
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 1 deletion.
10 changes: 10 additions & 0 deletions internal/internal_flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,16 @@ func (sf *sdkFlags) tryUse(flag sdkFlag, record bool) bool {
}
}

// set marks a flag as in current use regardless of replay status.
func (sf *sdkFlags) set(flags ...sdkFlag) {
if !sf.capabilities.GetSdkMetadata() {
return
}
for _, flag := range flags {
sf.currentFlags[flag] = true
}
}

// markSDKFlagsSent marks all sdk flags as sent to the server.
func (sf *sdkFlags) markSDKFlagsSent() {
for flag := range sf.newFlags {
Expand Down
61 changes: 61 additions & 0 deletions internal/internal_flags_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
// The MIT License
//
// Copyright (c) 2023 Temporal Technologies Inc. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

package internal

import (
"testing"

"github.com/stretchr/testify/require"
"go.temporal.io/api/workflowservice/v1"
)

var (
metadataDisabled = workflowservice.GetSystemInfoResponse_Capabilities{}
metadataEnabled = workflowservice.GetSystemInfoResponse_Capabilities{
SdkMetadata: true,
}
)

const testFlag = SDKFlagChildWorkflowErrorExecution

func TestSet(t *testing.T) {
t.Parallel()

t.Run("no server sdk metadata support", func(t *testing.T) {
flags := newSDKFlags(&metadataDisabled)
flags.set(testFlag)
require.Empty(t, flags.gatherNewSDKFlags(),
"flags assigned when servier does not support metadata are dropped")
require.False(t, flags.tryUse(testFlag, false),
"flags assigned when servier does not support metadata are dropped")
})

t.Run("with server sdk metadata support", func(t *testing.T) {
flags := newSDKFlags(&metadataEnabled)
flags.set(testFlag)
require.Empty(t, flags.gatherNewSDKFlags(),
"flag set via sdkFlags.set is not 'new'")
require.True(t, flags.tryUse(testFlag, false),
"flag set via sdkFlags.set should be immediately visible")
})
}
2 changes: 1 addition & 1 deletion internal/internal_task_handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -890,14 +890,14 @@ func (w *workflowExecutionContextImpl) ProcessWorkflowTask(workflowTask *workflo
eventHandler.ResetLAWFTAttemptCounts()
eventHandler.sdkFlags.markSDKFlagsSent()

// Process events
ProcessEvents:
for {
reorderedEvents, markers, binaryChecksum, flags, err := reorderedHistory.NextCommandEvents()
if err != nil {
return nil, err
}

eventHandler.sdkFlags.set(flags...)
if len(reorderedEvents) == 0 {
break ProcessEvents
}
Expand Down

0 comments on commit febeb48

Please sign in to comment.