mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

integration/v3_grpc_test: Fix quota tests

Browse Source 
Use the system page size to set the test quota size.  Also, change
a comment related to setting the node quota to be more clear.

Signed-off-by: Geoff Levand <geoff@infradead.org>
This commit is contained in:
Geoff Levand
2016-10-05 16:41:06 -07:00
parent de8adc9e03
commit 84d2ff93b0
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
integration/v3_grpc_test.go
View File

@ -17,6 +17,7 @@ package integration
import ( import (
"fmt" "fmt"
"math/rand" "math/rand"
"os"
"reflect" "reflect"
"testing" "testing"
"time" "time"
@ -583,10 +584,12 @@ func TestV3Hash(t *testing.T) {
// TestV3StorageQuotaAPI tests the V3 server respects quotas at the API layer // TestV3StorageQuotaAPI tests the V3 server respects quotas at the API layer
func TestV3StorageQuotaAPI(t *testing.T) { func TestV3StorageQuotaAPI(t *testing.T) {
defer testutil.AfterTest(t) defer testutil.AfterTest(t)
quotasize := int64(16 * os.Getpagesize())
clus := NewClusterV3(t, &ClusterConfig{Size: 3}) clus := NewClusterV3(t, &ClusterConfig{Size: 3})
clus.Members[0].QuotaBackendBytes = 64 * 1024 // Set a quota on one node
clus.Members[0].QuotaBackendBytes = quotasize
clus.Members[0].Stop(t) clus.Members[0].Stop(t)
clus.Members[0].Restart(t) clus.Members[0].Restart(t)
@ -602,7 +605,7 @@ func TestV3StorageQuotaAPI(t *testing.T) {
} }
// test big put // test big put
bigbuf := make([]byte, 64*1024) bigbuf := make([]byte, quotasize)
_, err := kvc.Put(context.TODO(), &pb.PutRequest{Key: key, Value: bigbuf}) _, err := kvc.Put(context.TODO(), &pb.PutRequest{Key: key, Value: bigbuf})
if !eqErrGRPC(err, rpctypes.ErrGRPCNoSpace) { if !eqErrGRPC(err, rpctypes.ErrGRPCNoSpace) {
t.Fatalf("big put got %v, expected %v", err, rpctypes.ErrGRPCNoSpace) t.Fatalf("big put got %v, expected %v", err, rpctypes.ErrGRPCNoSpace)
@ -628,14 +631,15 @@ func TestV3StorageQuotaAPI(t *testing.T) {
// TestV3StorageQuotaApply tests the V3 server respects quotas during apply // TestV3StorageQuotaApply tests the V3 server respects quotas during apply
func TestV3StorageQuotaApply(t *testing.T) { func TestV3StorageQuotaApply(t *testing.T) {
testutil.AfterTest(t) testutil.AfterTest(t)
quotasize := int64(16 * os.Getpagesize())
clus := NewClusterV3(t, &ClusterConfig{Size: 2}) clus := NewClusterV3(t, &ClusterConfig{Size: 2})
defer clus.Terminate(t) defer clus.Terminate(t)
kvc0 := toGRPC(clus.Client(0)).KV kvc0 := toGRPC(clus.Client(0)).KV
kvc1 := toGRPC(clus.Client(1)).KV kvc1 := toGRPC(clus.Client(1)).KV
// force a node to have a different quota // Set a quota on one node
clus.Members[0].QuotaBackendBytes = 64 * 1024 clus.Members[0].QuotaBackendBytes = quotasize
clus.Members[0].Stop(t) clus.Members[0].Stop(t)
clus.Members[0].Restart(t) clus.Members[0].Restart(t)
clus.waitLeader(t, clus.Members) clus.waitLeader(t, clus.Members)
@ -650,7 +654,7 @@ func TestV3StorageQuotaApply(t *testing.T) {
} }
// test big put // test big put
bigbuf := make([]byte, 64*1024) bigbuf := make([]byte, quotasize)
_, err := kvc1.Put(context.TODO(), &pb.PutRequest{Key: key, Value: bigbuf}) _, err := kvc1.Put(context.TODO(), &pb.PutRequest{Key: key, Value: bigbuf})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)