functional: add snapshot path to configuration

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>

functional.yaml

@@ -2,15 +2,15 @@ agent-configs:
 - etcd-exec-path: ./bin/etcd
   agent-addr: 127.0.0.1:19027
   failpoint-http-addr: http://127.0.0.1:7381
-  base-dir: /tmp/etcd-agent-data-1
+  base-dir: /tmp/etcd-functional-1
-  etcd-log-path: /tmp/etcd-agent-data-1/current-etcd.log
+  etcd-log-path: /tmp/etcd-functional-1/current-etcd.log
   etcd-client-proxy: false
   etcd-peer-proxy: true
   etcd-client-endpoint: 127.0.0.1:1379
   etcd:
     name: s1
-    data-dir: /tmp/etcd-agent-data-1/etcd.data
+    data-dir: /tmp/etcd-functional-1/etcd.data
-    wal-dir: /tmp/etcd-agent-data-1/etcd.data/member/wal
+    wal-dir: /tmp/etcd-functional-1/etcd.data/member/wal
     heartbeat-interval: 100
     election-timeout: 1000
     listen-client-urls: ["https://127.0.0.1:1379"]
@@ -34,18 +34,32 @@ agent-configs:
     quota-backend-bytes: 10740000000 # 10 GiB
     pre-vote: true
     initial-corrupt-check: true
+  client-cert-data: ""
+  client-cert-path: ""
+  client-key-data: ""
+  client-key-path: ""
+  client-trusted-ca-data: ""
+  client-trusted-ca-path: ""
+  peer-cert-data: ""
+  peer-cert-path: ""
+  peer-key-data: ""
+  peer-key-path: ""
+  peer-trusted-ca-data: ""
+  peer-trusted-ca-path: ""
+  snapshot-path: /tmp/etcd-functional-1.snapshot.db
+
 - etcd-exec-path: ./bin/etcd
   agent-addr: 127.0.0.1:29027
   failpoint-http-addr: http://127.0.0.1:7382
-  base-dir: /tmp/etcd-agent-data-2
+  base-dir: /tmp/etcd-functional-2
-  etcd-log-path: /tmp/etcd-agent-data-2/current-etcd.log
+  etcd-log-path: /tmp/etcd-functional-2/current-etcd.log
   etcd-client-proxy: false
   etcd-peer-proxy: true
   etcd-client-endpoint: 127.0.0.1:2379
   etcd:
     name: s2
-    data-dir: /tmp/etcd-agent-data-2/etcd.data
+    data-dir: /tmp/etcd-functional-2/etcd.data
-    wal-dir: /tmp/etcd-agent-data-2/etcd.data/member/wal
+    wal-dir: /tmp/etcd-functional-2/etcd.data/member/wal
     heartbeat-interval: 100
     election-timeout: 1000
     listen-client-urls: ["https://127.0.0.1:2379"]
@@ -69,18 +83,32 @@ agent-configs:
     quota-backend-bytes: 10740000000 # 10 GiB
     pre-vote: true
     initial-corrupt-check: true
+  client-cert-data: ""
+  client-cert-path: ""
+  client-key-data: ""
+  client-key-path: ""
+  client-trusted-ca-data: ""
+  client-trusted-ca-path: ""
+  peer-cert-data: ""
+  peer-cert-path: ""
+  peer-key-data: ""
+  peer-key-path: ""
+  peer-trusted-ca-data: ""
+  peer-trusted-ca-path: ""
+  snapshot-path: /tmp/etcd-functional-2.snapshot.db
+
 - etcd-exec-path: ./bin/etcd
   agent-addr: 127.0.0.1:39027
   failpoint-http-addr: http://127.0.0.1:7383
-  base-dir: /tmp/etcd-agent-data-3
+  base-dir: /tmp/etcd-functional-3
-  etcd-log-path: /tmp/etcd-agent-data-3/current-etcd.log
+  etcd-log-path: /tmp/etcd-functional-3/current-etcd.log
   etcd-client-proxy: false
   etcd-peer-proxy: true
   etcd-client-endpoint: 127.0.0.1:3379
   etcd:
     name: s3
-    data-dir: /tmp/etcd-agent-data-3/etcd.data
+    data-dir: /tmp/etcd-functional-3/etcd.data
-    wal-dir: /tmp/etcd-agent-data-3/etcd.data/member/wal
+    wal-dir: /tmp/etcd-functional-3/etcd.data/member/wal
     heartbeat-interval: 100
     election-timeout: 1000
     listen-client-urls: ["https://127.0.0.1:3379"]
@@ -104,6 +132,19 @@ agent-configs:
     quota-backend-bytes: 10740000000 # 10 GiB
     pre-vote: true
     initial-corrupt-check: true
+  client-cert-data: ""
+  client-cert-path: ""
+  client-key-data: ""
+  client-key-path: ""
+  client-trusted-ca-data: ""
+  client-trusted-ca-path: ""
+  peer-cert-data: ""
+  peer-cert-path: ""
+  peer-key-data: ""
+  peer-key-path: ""
+  peer-trusted-ca-data: ""
+  peer-trusted-ca-path: ""
+  snapshot-path: /tmp/etcd-functional-3.snapshot.db
 
 tester-config:
   data-dir: /tmp/etcd-tester-data

functional/tester/cluster_test.go

@@ -31,15 +31,15 @@ func Test_read(t *testing.T) {
 				EtcdExecPath:       "./bin/etcd",
 				AgentAddr:          "127.0.0.1:19027",
 				FailpointHTTPAddr:  "http://127.0.0.1:7381",
-				BaseDir:            "/tmp/etcd-agent-data-1",
+				BaseDir:            "/tmp/etcd-functional-1",
-				EtcdLogPath:        "/tmp/etcd-agent-data-1/current-etcd.log",
+				EtcdLogPath:        "/tmp/etcd-functional-1/current-etcd.log",
 				EtcdClientProxy:    false,
 				EtcdPeerProxy:      true,
 				EtcdClientEndpoint: "127.0.0.1:1379",
 				Etcd: &rpcpb.Etcd{
 					Name:                "s1",
-					DataDir:             "/tmp/etcd-agent-data-1/etcd.data",
+					DataDir:             "/tmp/etcd-functional-1/etcd.data",
-					WALDir:              "/tmp/etcd-agent-data-1/etcd.data/member/wal",
+					WALDir:              "/tmp/etcd-functional-1/etcd.data/member/wal",
 					HeartbeatIntervalMs: 100,
 					ElectionTimeoutMs:   1000,
 					ListenClientURLs:    []string{"https://127.0.0.1:1379"},
@@ -64,20 +64,33 @@ func Test_read(t *testing.T) {
 					PreVote:             true,
 					InitialCorruptCheck: true,
 				},
+				ClientCertData:      "",
+				ClientCertPath:      "",
+				ClientKeyData:       "",
+				ClientKeyPath:       "",
+				ClientTrustedCAData: "",
+				ClientTrustedCAPath: "",
+				PeerCertData:        "",
+				PeerCertPath:        "",
+				PeerKeyData:         "",
+				PeerKeyPath:         "",
+				PeerTrustedCAData:   "",
+				PeerTrustedCAPath:   "",
+				SnapshotPath:        "/tmp/etcd-functional-1.snapshot.db",
 			},
 			{
 				EtcdExecPath:       "./bin/etcd",
 				AgentAddr:          "127.0.0.1:29027",
 				FailpointHTTPAddr:  "http://127.0.0.1:7382",
-				BaseDir:            "/tmp/etcd-agent-data-2",
+				BaseDir:            "/tmp/etcd-functional-2",
-				EtcdLogPath:        "/tmp/etcd-agent-data-2/current-etcd.log",
+				EtcdLogPath:        "/tmp/etcd-functional-2/current-etcd.log",
 				EtcdClientProxy:    false,
 				EtcdPeerProxy:      true,
 				EtcdClientEndpoint: "127.0.0.1:2379",
 				Etcd: &rpcpb.Etcd{
 					Name:                "s2",
-					DataDir:             "/tmp/etcd-agent-data-2/etcd.data",
+					DataDir:             "/tmp/etcd-functional-2/etcd.data",
-					WALDir:              "/tmp/etcd-agent-data-2/etcd.data/member/wal",
+					WALDir:              "/tmp/etcd-functional-2/etcd.data/member/wal",
 					HeartbeatIntervalMs: 100,
 					ElectionTimeoutMs:   1000,
 					ListenClientURLs:    []string{"https://127.0.0.1:2379"},
@@ -102,20 +115,33 @@ func Test_read(t *testing.T) {
 					PreVote:             true,
 					InitialCorruptCheck: true,
 				},
+				ClientCertData:      "",
+				ClientCertPath:      "",
+				ClientKeyData:       "",
+				ClientKeyPath:       "",
+				ClientTrustedCAData: "",
+				ClientTrustedCAPath: "",
+				PeerCertData:        "",
+				PeerCertPath:        "",
+				PeerKeyData:         "",
+				PeerKeyPath:         "",
+				PeerTrustedCAData:   "",
+				PeerTrustedCAPath:   "",
+				SnapshotPath:        "/tmp/etcd-functional-2.snapshot.db",
 			},
 			{
 				EtcdExecPath:       "./bin/etcd",
 				AgentAddr:          "127.0.0.1:39027",
 				FailpointHTTPAddr:  "http://127.0.0.1:7383",
-				BaseDir:            "/tmp/etcd-agent-data-3",
+				BaseDir:            "/tmp/etcd-functional-3",
-				EtcdLogPath:        "/tmp/etcd-agent-data-3/current-etcd.log",
+				EtcdLogPath:        "/tmp/etcd-functional-3/current-etcd.log",
 				EtcdClientProxy:    false,
 				EtcdPeerProxy:      true,
 				EtcdClientEndpoint: "127.0.0.1:3379",
 				Etcd: &rpcpb.Etcd{
 					Name:                "s3",
-					DataDir:             "/tmp/etcd-agent-data-3/etcd.data",
+					DataDir:             "/tmp/etcd-functional-3/etcd.data",
-					WALDir:              "/tmp/etcd-agent-data-3/etcd.data/member/wal",
+					WALDir:              "/tmp/etcd-functional-3/etcd.data/member/wal",
 					HeartbeatIntervalMs: 100,
 					ElectionTimeoutMs:   1000,
 					ListenClientURLs:    []string{"https://127.0.0.1:3379"},
@@ -140,6 +166,19 @@ func Test_read(t *testing.T) {
 					PreVote:             true,
 					InitialCorruptCheck: true,
 				},
+				ClientCertData:      "",
+				ClientCertPath:      "",
+				ClientKeyData:       "",
+				ClientKeyPath:       "",
+				ClientTrustedCAData: "",
+				ClientTrustedCAPath: "",
+				PeerCertData:        "",
+				PeerCertPath:        "",
+				PeerKeyData:         "",
+				PeerKeyPath:         "",
+				PeerTrustedCAData:   "",
+				PeerTrustedCAPath:   "",
+				SnapshotPath:        "/tmp/etcd-functional-3.snapshot.db",
 			},
 		},
 		Tester: &rpcpb.Tester{