From 3889cda1cc06479fb2d2385b57ea2c875ab804e5 Mon Sep 17 00:00:00 2001 From: David Porter Date: Fri, 11 Apr 2025 17:23:32 -0700 Subject: [PATCH 1/4] maybe fix test? --- .../historyV2PersistenceTest.go | 37 ++++++++++++++----- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/common/persistence/persistence-tests/historyV2PersistenceTest.go b/common/persistence/persistence-tests/historyV2PersistenceTest.go index d26aa2936c0..aaafb3c2e57 100644 --- a/common/persistence/persistence-tests/historyV2PersistenceTest.go +++ b/common/persistence/persistence-tests/historyV2PersistenceTest.go @@ -38,6 +38,7 @@ import ( "github.com/uber/cadence/common" "github.com/uber/cadence/common/backoff" "github.com/uber/cadence/common/codec" + "github.com/uber/cadence/common/persistence" p "github.com/uber/cadence/common/persistence" persistenceutils "github.com/uber/cadence/common/persistence/persistence-utils" "github.com/uber/cadence/common/types" @@ -87,6 +88,31 @@ func (s *HistoryV2PersistenceSuite) SetupSuite() { } } +func (s *HistoryV2PersistenceSuite) AfterTest(_, _ string) { + // ensure there's no leftover trees in the database + // between tests + if os.Getenv("SKIP_SCAN_HISTORY") != "" { + s.T().Skipf("GetAllHistoryTreeBranches not supported in %v", s.TaskMgr.GetName()) + } + ctx, cancel := context.WithTimeout(context.Background(), largeTestContextTimeout) + defer cancel() + + resp, err := s.HistoryV2Mgr.GetAllHistoryTreeBranches(ctx, &p.GetAllHistoryTreeBranchesRequest{ + PageSize: 1, + }) + s.Nil(err) + for _, br := range resp.Branches { + branchToken, err := persistence.NewHistoryBranchToken(br.TreeID) + s.Nil(err) + + s.HistoryV2Mgr.DeleteHistoryBranch(ctx, &p.DeleteHistoryBranchRequest{ + BranchToken: branchToken, + }) + s.Nil(err) + } + s.Equal(0, len(resp.Branches), "some trees were leaked in other tests") +} + // SetupTest implementation func (s *HistoryV2PersistenceSuite) SetupTest() { // Have to define our overridden assertions in the test setup. If we did it earlier, s.T() will return nil @@ -122,18 +148,9 @@ func (s *HistoryV2PersistenceSuite) TestGenUUIDs() { // TestScanAllTrees test func (s *HistoryV2PersistenceSuite) TestScanAllTrees() { - if os.Getenv("SKIP_SCAN_HISTORY") != "" { - s.T().Skipf("GetAllHistoryTreeBranches not supported in %v", s.TaskMgr.GetName()) - } - ctx, cancel := context.WithTimeout(context.Background(), largeTestContextTimeout) + ctx, cancel := context.WithTimeout(context.Background(), testContextTimeout) defer cancel() - resp, err := s.HistoryV2Mgr.GetAllHistoryTreeBranches(ctx, &p.GetAllHistoryTreeBranchesRequest{ - PageSize: 1, - }) - s.Nil(err) - s.Equal(0, len(resp.Branches), "some trees were leaked in other tests") - trees := map[string]bool{} totalTrees := 1002 pgSize := 100 From 5bb9825142fe04082da2973258552ec2b83f76f2 Mon Sep 17 00:00:00 2001 From: David Porter Date: Fri, 11 Apr 2025 17:26:30 -0700 Subject: [PATCH 2/4] fix --- .../persistence/persistence-tests/historyV2PersistenceTest.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/persistence/persistence-tests/historyV2PersistenceTest.go b/common/persistence/persistence-tests/historyV2PersistenceTest.go index aaafb3c2e57..66c75688e18 100644 --- a/common/persistence/persistence-tests/historyV2PersistenceTest.go +++ b/common/persistence/persistence-tests/historyV2PersistenceTest.go @@ -102,7 +102,7 @@ func (s *HistoryV2PersistenceSuite) AfterTest(_, _ string) { }) s.Nil(err) for _, br := range resp.Branches { - branchToken, err := persistence.NewHistoryBranchToken(br.TreeID) + branchToken, err := persistence.NewHistoryBranchTokenByBranchID(br.TreeID, br.BranchID) s.Nil(err) s.HistoryV2Mgr.DeleteHistoryBranch(ctx, &p.DeleteHistoryBranchRequest{ From 82adeb6bbea743efb751997e79585a2c78e5c9d8 Mon Sep 17 00:00:00 2001 From: David Porter Date: Fri, 11 Apr 2025 18:01:57 -0700 Subject: [PATCH 3/4] Fix --- common/persistence/persistence-tests/historyV2PersistenceTest.go | 1 + 1 file changed, 1 insertion(+) diff --git a/common/persistence/persistence-tests/historyV2PersistenceTest.go b/common/persistence/persistence-tests/historyV2PersistenceTest.go index 66c75688e18..cdc5d9ba4ee 100644 --- a/common/persistence/persistence-tests/historyV2PersistenceTest.go +++ b/common/persistence/persistence-tests/historyV2PersistenceTest.go @@ -107,6 +107,7 @@ func (s *HistoryV2PersistenceSuite) AfterTest(_, _ string) { s.HistoryV2Mgr.DeleteHistoryBranch(ctx, &p.DeleteHistoryBranchRequest{ BranchToken: branchToken, + ShardID: common.IntPtr(0), }) s.Nil(err) } From 71fba27da287b50260666bb804799a1f3feb9b60 Mon Sep 17 00:00:00 2001 From: David Porter Date: Fri, 11 Apr 2025 18:27:28 -0700 Subject: [PATCH 4/4] fmt --- .../persistence/persistence-tests/historyV2PersistenceTest.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/persistence/persistence-tests/historyV2PersistenceTest.go b/common/persistence/persistence-tests/historyV2PersistenceTest.go index cdc5d9ba4ee..aaf890f082d 100644 --- a/common/persistence/persistence-tests/historyV2PersistenceTest.go +++ b/common/persistence/persistence-tests/historyV2PersistenceTest.go @@ -107,7 +107,7 @@ func (s *HistoryV2PersistenceSuite) AfterTest(_, _ string) { s.HistoryV2Mgr.DeleteHistoryBranch(ctx, &p.DeleteHistoryBranchRequest{ BranchToken: branchToken, - ShardID: common.IntPtr(0), + ShardID: common.IntPtr(0), }) s.Nil(err) }