Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

debug #6686

Closed
wants to merge 2 commits into from
Closed

debug #6686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb01189
Update Cassandra to write history tasks to new columns
Shaddoll Feb 24, 2025
c790c3c
revert nosql change and debug
Shaddoll Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions common/persistence/client/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,10 +526,20 @@ func (f *factoryImpl) init(clusterName string, limiters map[string]quotas.Limite
defaultDataStore := Datastore{ratelimit: limiters[f.config.DefaultStore]}
switch {
case defaultCfg.NoSQL != nil:
parser, err := serialization.NewParser(common.EncodingTypeThriftRW, common.EncodingTypeThriftRW)
if err != nil {
f.logger.Fatal("failed to construct parser", tag.Error(err))
}
taskSerializer := serialization.NewTaskSerializer(parser)
shardedNoSQLConfig := defaultCfg.NoSQL.ConvertToShardedNoSQLConfig()
defaultDataStore.factory = nosql.NewFactory(*shardedNoSQLConfig, clusterName, f.logger, f.dc)
defaultDataStore.factory = nosql.NewFactory(*shardedNoSQLConfig, clusterName, f.logger, taskSerializer, f.dc)
case defaultCfg.ShardedNoSQL != nil:
defaultDataStore.factory = nosql.NewFactory(*defaultCfg.ShardedNoSQL, clusterName, f.logger, f.dc)
parser, err := serialization.NewParser(common.EncodingTypeThriftRW, common.EncodingTypeThriftRW)
if err != nil {
f.logger.Fatal("failed to construct parser", tag.Error(err))
}
taskSerializer := serialization.NewTaskSerializer(parser)
defaultDataStore.factory = nosql.NewFactory(*defaultCfg.ShardedNoSQL, clusterName, f.logger, taskSerializer, f.dc)
case defaultCfg.SQL != nil:
if defaultCfg.SQL.EncodingType == "" {
defaultCfg.SQL.EncodingType = string(common.EncodingTypeThriftRW)
Expand Down Expand Up @@ -572,8 +582,13 @@ func (f *factoryImpl) init(clusterName string, limiters map[string]quotas.Limite
visibilityDataStore := Datastore{ratelimit: limiters[f.config.VisibilityStore]}
switch {
case visibilityCfg.NoSQL != nil:
parser, err := serialization.NewParser(common.EncodingTypeThriftRW, common.EncodingTypeThriftRW)
if err != nil {
f.logger.Fatal("failed to construct parser", tag.Error(err))
}
taskSerializer := serialization.NewTaskSerializer(parser)
shardedNoSQLConfig := visibilityCfg.NoSQL.ConvertToShardedNoSQLConfig()
visibilityDataStore.factory = nosql.NewFactory(*shardedNoSQLConfig, clusterName, f.logger, f.dc)
visibilityDataStore.factory = nosql.NewFactory(*shardedNoSQLConfig, clusterName, f.logger, taskSerializer, f.dc)
case visibilityCfg.SQL != nil:
var decodingTypes []common.EncodingType
for _, dt := range visibilityCfg.SQL.DecodingTypes {
Expand Down
20 changes: 13 additions & 7 deletions common/persistence/nosql/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"github.com/uber/cadence/common/config"
"github.com/uber/cadence/common/log"
"github.com/uber/cadence/common/persistence"
"github.com/uber/cadence/common/persistence/serialization"
)

type (
Expand All @@ -37,22 +38,25 @@ type (
logger log.Logger
execStoreFactory *executionStoreFactory
dc *persistence.DynamicConfiguration
taskSerializer serialization.TaskSerializer
}

executionStoreFactory struct {
logger log.Logger
shardedNosqlStore shardedNosqlStore
taskSerializer serialization.TaskSerializer
}
)

// NewFactory returns an instance of a factory object which can be used to create
// datastores that are backed by cassandra
func NewFactory(cfg config.ShardedNoSQL, clusterName string, logger log.Logger, dc *persistence.DynamicConfiguration) *Factory {
func NewFactory(cfg config.ShardedNoSQL, clusterName string, logger log.Logger, taskSerializer serialization.TaskSerializer, dc *persistence.DynamicConfiguration) *Factory {
return &Factory{
cfg: cfg,
clusterName: clusterName,
logger: logger,
dc: dc,
cfg: cfg,
clusterName: clusterName,
logger: logger,
taskSerializer: taskSerializer,
dc: dc,
}
}

Expand Down Expand Up @@ -122,7 +126,7 @@ func (f *Factory) executionStoreFactory() (*executionStoreFactory, error) {
return f.execStoreFactory, nil
}

factory, err := newExecutionStoreFactory(f.cfg, f.logger, f.dc)
factory, err := newExecutionStoreFactory(f.cfg, f.logger, f.taskSerializer, f.dc)
if err != nil {
return nil, err
}
Expand All @@ -134,13 +138,15 @@ func (f *Factory) executionStoreFactory() (*executionStoreFactory, error) {
func newExecutionStoreFactory(
cfg config.ShardedNoSQL,
logger log.Logger,
taskSerializer serialization.TaskSerializer,
dc *persistence.DynamicConfiguration,
) (*executionStoreFactory, error) {
s, err := newShardedNosqlStore(cfg, logger, dc)
if err != nil {
return nil, err
}
return &executionStoreFactory{
taskSerializer: taskSerializer,
logger: logger,
shardedNosqlStore: s,
}, nil
Expand All @@ -156,7 +162,7 @@ func (f *executionStoreFactory) new(shardID int) (persistence.ExecutionStore, er
if err != nil {
return nil, err
}
pmgr, err := NewExecutionStore(shardID, storeShard.db, f.logger)
pmgr, err := NewExecutionStore(shardID, storeShard.db, f.logger, f.taskSerializer)
if err != nil {
return nil, err
}
Expand Down
6 changes: 5 additions & 1 deletion common/persistence/nosql/nosql_execution_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,27 +28,31 @@ import (
"github.com/uber/cadence/common/log/tag"
"github.com/uber/cadence/common/persistence"
"github.com/uber/cadence/common/persistence/nosql/nosqlplugin"
"github.com/uber/cadence/common/persistence/serialization"
"github.com/uber/cadence/common/types"
)

// Implements ExecutionStore
type nosqlExecutionStore struct {
shardID int
nosqlStore
taskSerializer serialization.TaskSerializer
}

// NewExecutionStore is used to create an instance of ExecutionStore implementation
func NewExecutionStore(
shardID int,
db nosqlplugin.DB,
logger log.Logger,
taskSerializer serialization.TaskSerializer,
) (persistence.ExecutionStore, error) {
return &nosqlExecutionStore{
nosqlStore: nosqlStore{
logger: logger,
db: db,
},
shardID: shardID,
shardID: shardID,
taskSerializer: taskSerializer,
}, nil
}

Expand Down
9 changes: 2 additions & 7 deletions common/persistence/nosql/nosql_execution_store_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@ func (d *nosqlExecutionStore) prepareTimerTasksForWorkflowTxn(domainID, workflow
attempt = int64(t.Attempt)

case *persistence.WorkflowBackoffTimerTask:
eventID = t.EventID
timeoutType = t.TimeoutType

case *persistence.WorkflowTimeoutTask:
Expand Down Expand Up @@ -377,15 +376,14 @@ func (d *nosqlExecutionStore) prepareTransferTasksForWorkflowTxn(domainID, workf

switch task.GetType() {
case persistence.TransferTaskTypeActivityTask:
targetDomainID = task.(*persistence.ActivityTask).DomainID
targetDomainID = task.(*persistence.ActivityTask).TargetDomainID
taskList = task.(*persistence.ActivityTask).TaskList
scheduleID = task.(*persistence.ActivityTask).ScheduleID

case persistence.TransferTaskTypeDecisionTask:
targetDomainID = task.(*persistence.DecisionTask).DomainID
targetDomainID = task.(*persistence.DecisionTask).TargetDomainID
taskList = task.(*persistence.DecisionTask).TaskList
scheduleID = task.(*persistence.DecisionTask).ScheduleID
recordVisibility = task.(*persistence.DecisionTask).RecordVisibility

case persistence.TransferTaskTypeCancelExecution:
targetDomainID = task.(*persistence.CancelExecutionTask).TargetDomainID
Expand Down Expand Up @@ -420,9 +418,6 @@ func (d *nosqlExecutionStore) prepareTransferTasksForWorkflowTxn(domainID, workf
targetRunID = persistence.TransferTaskTransferTargetRunID
}

case persistence.TransferTaskTypeApplyParentClosePolicy:
targetDomainIDs = task.(*persistence.ApplyParentClosePolicyTask).TargetDomainIDs

case persistence.TransferTaskTypeCloseExecution,
persistence.TransferTaskTypeRecordWorkflowStarted,
persistence.TransferTaskTypeResetWorkflow,
Expand Down
Loading
Loading