From 337beb1f89163ccc4242d7bf86bb94fede2aeebe Mon Sep 17 00:00:00 2001
From: Howie <haoweili35@gmail.com>
Date: Thu, 6 May 2021 11:05:53 +0800
Subject: [PATCH] *: the value of tikv-client.copr-cache.capacity-mb should >=0
 (#24232)

---
 store/copr/coprocessor_cache.go           | 2 +-
 store/copr/coprocessor_cache_test.go      | 5 +++++
 store/mockstore/mockcopr/executor_test.go | 3 ++-
 store/mockstore/mockstorage/storage.go    | 7 ++++---
 store/mockstore/tikv.go                   | 2 +-
 store/mockstore/unistore.go               | 2 +-
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/store/copr/coprocessor_cache.go b/store/copr/coprocessor_cache.go
index 377690fc8d..d4ddf1806d 100644
--- a/store/copr/coprocessor_cache.go
+++ b/store/copr/coprocessor_cache.go
@@ -61,7 +61,7 @@ func newCoprCache(config *config.CoprocessorCache) (*coprCache, error) {
 		return nil, nil
 	}
 	capacityInBytes := int64(config.CapacityMB * 1024.0 * 1024.0)
-	if capacityInBytes == 0 {
+	if capacityInBytes <= 0 {
 		return nil, errors.New("Capacity must be > 0 to enable the cache")
 	}
 	maxEntityInBytes := int64(config.AdmissionMaxResultMB * 1024.0 * 1024.0)
diff --git a/store/copr/coprocessor_cache_test.go b/store/copr/coprocessor_cache_test.go
index 14084f978d..f257e161e2 100644
--- a/store/copr/coprocessor_cache_test.go
+++ b/store/copr/coprocessor_cache_test.go
@@ -192,3 +192,8 @@ func (s *testCoprocessorSuite) TestGetSet(c *C) {
 	c.Assert(v, NotNil)
 	c.Assert(v.Data, DeepEquals, []byte("bar"))
 }
+
+func (s *testCoprocessorSuite) TestIssue24118(c *C) {
+	_, err := newCoprCache(&config.CoprocessorCache{AdmissionMinProcessMs: 5, AdmissionMaxResultMB: 1, CapacityMB: -1})
+	c.Assert(err.Error(), Equals, "Capacity must be > 0 to enable the cache")
+}
diff --git a/store/mockstore/mockcopr/executor_test.go b/store/mockstore/mockcopr/executor_test.go
index 39dd945d23..af9ac45bea 100644
--- a/store/mockstore/mockcopr/executor_test.go
+++ b/store/mockstore/mockcopr/executor_test.go
@@ -55,7 +55,8 @@ func (s *testExecutorSuite) SetUpSuite(c *C) {
 	s.mvccStore = rpcClient.MvccStore
 	store, err := tikv.NewTestTiKVStore(rpcClient, pdClient, nil, nil, 0)
 	c.Assert(err, IsNil)
-	s.store = mockstorage.NewMockStorage(store)
+	s.store, err = mockstorage.NewMockStorage(store)
+	c.Assert(err, IsNil)
 	session.SetSchemaLease(0)
 	session.DisableStats4Test()
 	s.dom, err = session.BootstrapSession(s.store)
diff --git a/store/mockstore/mockstorage/storage.go b/store/mockstore/mockstorage/storage.go
index 63875acaad..05ece29c57 100644
--- a/store/mockstore/mockstorage/storage.go
+++ b/store/mockstore/mockstorage/storage.go
@@ -33,17 +33,18 @@ type mockStorage struct {
 }
 
 // NewMockStorage wraps tikv.KVStore as kv.Storage.
-func NewMockStorage(tikvStore *tikv.KVStore) kv.Storage {
+func NewMockStorage(tikvStore *tikv.KVStore) (kv.Storage, error) {
 	coprConfig := config.DefaultConfig().TiKVClient.CoprCache
 	coprStore, err := copr.NewStore(tikvStore, &coprConfig)
 	if err != nil {
-		panic(err)
+		return nil, err
 	}
 	return &mockStorage{
 		KVStore:  tikvStore,
 		Store:    coprStore,
 		memCache: kv.NewCacheDB(),
-	}
+	}, nil
+
 }
 
 func (s *mockStorage) EtcdAddrs() ([]string, error) {
diff --git a/store/mockstore/tikv.go b/store/mockstore/tikv.go
index 10378a51e3..ff179c4544 100644
--- a/store/mockstore/tikv.go
+++ b/store/mockstore/tikv.go
@@ -35,5 +35,5 @@ func newMockTikvStore(opt *mockOptions) (kv.Storage, error) {
 	if err != nil {
 		return nil, err
 	}
-	return mockstorage.NewMockStorage(kvstore), nil
+	return mockstorage.NewMockStorage(kvstore)
 }
diff --git a/store/mockstore/unistore.go b/store/mockstore/unistore.go
index c712a979f8..5476a6f6e7 100644
--- a/store/mockstore/unistore.go
+++ b/store/mockstore/unistore.go
@@ -36,5 +36,5 @@ func newUnistore(opts *mockOptions) (kv.Storage, error) {
 	if err != nil {
 		return nil, err
 	}
-	return mockstorage.NewMockStorage(kvstore), nil
+	return mockstorage.NewMockStorage(kvstore)
 }