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

Revert "gcworker: let gofail in gcworker run serially, make ci happy" #8944

Merged
merged 7 commits into from
Jan 7, 2019
Merged

Revert "gcworker: let gofail in gcworker run serially, make ci happy" #8944

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a91d804
Revert "planner: added support for error in visitInfo (#8855)"
zimulala Jan 4, 2019
9b30cde
Revert "expression: constraint propagate for '>' and monotonous funct…
zimulala Jan 4, 2019
0205cfd
Revert "planner,executor: support `show create database if not exists…
zimulala Jan 4, 2019
54eaa49
Revert "infoschema: add initial support for views (#8892)"
zimulala Jan 4, 2019
c02c35f
Revert "gcworker: let gofail in gcworker run serially, make ci happy …
zimulala Jan 4, 2019
2db106f
Merge branch 'master' into revert-8912-fix_gofail_parallel
zimulala Jan 4, 2019
76caa56
Merge branch 'master' into revert-8912-fix_gofail_parallel
zz-jason Jan 6, 2019
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
76 changes: 23 additions & 53 deletions store/tikv/gcworker/gc_worker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ type testGCWorkerSuite struct {
}

var _ = Suite(&testGCWorkerSuite{})
var _ = SerialSuites(&testGCWorkerSerialSuite{})

func (s *testGCWorkerSuite) SetUpTest(c *C) {
tikv.NewGCHandlerFunc = NewGCWorker
Expand Down Expand Up @@ -161,58 +160,7 @@ func (s *testGCWorkerSuite) TestPrepareGC(c *C) {
c.Assert(ok, IsTrue)
}

func (s *testGCWorkerSuite) TestDoGC(c *C) {
var err error
ctx := context.Background()

gcSafePointCacheInterval = 1

err = s.gcWorker.saveValueToSysTable(gcConcurrencyKey, strconv.Itoa(gcDefaultConcurrency))
c.Assert(err, IsNil)
err = s.gcWorker.doGC(ctx, 20)
c.Assert(err, IsNil)

err = s.gcWorker.saveValueToSysTable(gcConcurrencyKey, strconv.Itoa(gcMinConcurrency))
c.Assert(err, IsNil)
err = s.gcWorker.doGC(ctx, 20)
c.Assert(err, IsNil)

err = s.gcWorker.saveValueToSysTable(gcConcurrencyKey, strconv.Itoa(gcMaxConcurrency))
c.Assert(err, IsNil)
err = s.gcWorker.doGC(ctx, 20)
c.Assert(err, IsNil)
}

type testGCWorkerSerialSuite struct {
store tikv.Storage
oracle *mockoracle.MockOracle
gcWorker *GCWorker
dom *domain.Domain
}

func (s *testGCWorkerSerialSuite) SetUpTest(c *C) {
tikv.NewGCHandlerFunc = NewGCWorker
store, err := mockstore.NewMockTikvStore()
s.store = store.(tikv.Storage)
c.Assert(err, IsNil)
s.oracle = &mockoracle.MockOracle{}
s.store.SetOracle(s.oracle)
s.dom, err = session.BootstrapSession(s.store)
c.Assert(err, IsNil)
gcWorker, err := NewGCWorker(s.store, nil)
c.Assert(err, IsNil)
gcWorker.Start()
gcWorker.Close()
s.gcWorker = gcWorker.(*GCWorker)
}

func (s *testGCWorkerSerialSuite) TearDownTest(c *C) {
s.dom.Close()
err := s.store.Close()
c.Assert(err, IsNil)
}

func (s *testGCWorkerSerialSuite) TestDoGCForOneRegion(c *C) {
func (s *testGCWorkerSuite) TestDoGCForOneRegion(c *C) {
var successRegions int32
var failedRegions int32
taskWorker := newGCTaskWorker(s.store, nil, nil, s.gcWorker.uuid, &successRegions, &failedRegions)
Expand Down Expand Up @@ -244,3 +192,25 @@ func (s *testGCWorkerSerialSuite) TestDoGCForOneRegion(c *C) {
c.Assert(err, IsNil)
gofail.Disable("github.com/pingcap/tidb/store/tikv/tikvStoreSendReqResult")
}

func (s *testGCWorkerSuite) TestDoGC(c *C) {
var err error
ctx := context.Background()

gcSafePointCacheInterval = 1

err = s.gcWorker.saveValueToSysTable(gcConcurrencyKey, strconv.Itoa(gcDefaultConcurrency))
c.Assert(err, IsNil)
err = s.gcWorker.doGC(ctx, 20)
c.Assert(err, IsNil)

err = s.gcWorker.saveValueToSysTable(gcConcurrencyKey, strconv.Itoa(gcMinConcurrency))
c.Assert(err, IsNil)
err = s.gcWorker.doGC(ctx, 20)
c.Assert(err, IsNil)

err = s.gcWorker.saveValueToSysTable(gcConcurrencyKey, strconv.Itoa(gcMaxConcurrency))
c.Assert(err, IsNil)
err = s.gcWorker.doGC(ctx, 20)
c.Assert(err, IsNil)
}