This is an automated email from the ASF dual-hosted git repository.
junchao pushed a commit to branch smart_contract_merge
in repository https://gitbox.apache.org/repos/asf/incubator-resilientdb.git
The following commit(s) were added to refs/heads/smart_contract_merge by this
push:
new 6d6c9f70 merge master
6d6c9f70 is described below
commit 6d6c9f7032d641a8651292806cdc3f793bb73db0
Author: cjcchen <[email protected]>
AuthorDate: Fri Feb 14 03:09:17 2025 +0800
merge master
---
scripts/deploy/config/cassandra.config | 10 -
scripts/deploy/config/fair.config | 10 -
scripts/deploy/config/fairrl.config | 10 -
scripts/deploy/config/hs.config | 11 -
scripts/deploy/config/kv_performance_server.conf | 9 +-
.../deploy/config/kv_performance_server_128.conf | 262 ---------------------
.../config/kv_performance_server_128_small.conf | 261 --------------------
.../deploy/config/kv_performance_server_16.conf | 39 ---
.../deploy/config/kv_performance_server_16_2.conf | 53 -----
.../deploy/config/kv_performance_server_32.conf | 69 ------
.../deploy/config/kv_performance_server_48.conf | 101 --------
.../deploy/config/kv_performance_server_64.conf | 133 -----------
scripts/deploy/config/kv_performance_server_8.conf | 28 ---
.../config/kv_performance_server_small_128.conf | 261 --------------------
.../config/kv_performance_server_small_16.conf | 37 ---
.../config/kv_performance_server_small_32.conf | 69 ------
.../config/kv_performance_server_small_64.conf | 133 -----------
.../config/kv_performance_server_small_8.conf | 20 --
.../config/kv_performance_server_test_5.conf | 10 -
scripts/deploy/config/kv_server.conf | 10 +-
scripts/deploy/config/pbft.config | 12 +-
scripts/deploy/config/poe.config | 9 +-
scripts/deploy/config/poe_performance_server.conf | 10 -
.../config/poe_performance_server_nomac.conf | 10 -
scripts/deploy/config/rcc.config | 10 -
scripts/deploy/config/template.config | 12 +-
scripts/deploy/config/tusk.config | 10 -
scripts/deploy/config/zzy.config | 13 -
28 files changed, 22 insertions(+), 1600 deletions(-)
diff --git a/scripts/deploy/config/cassandra.config
b/scripts/deploy/config/cassandra.config
deleted file mode 100644
index d452da24..00000000
--- a/scripts/deploy/config/cassandra.config
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "clientBatchNum": 1000,
- "enable_viewchange": false,
- "recovery_enabled": false,
- "max_client_complaint_num":10,
- "max_process_txn": 64,
- "worker_num": 2,
- "input_worker_num": 1,
- "output_worker_num": 5
-}
diff --git a/scripts/deploy/config/fair.config
b/scripts/deploy/config/fair.config
deleted file mode 100644
index b5242eac..00000000
--- a/scripts/deploy/config/fair.config
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "clientBatchNum": 400,
- "enable_viewchange": false,
- "recovery_enabled": false,
- "max_client_complaint_num":10,
- "max_process_txn": 256,
- "worker_num": 2,
- "input_worker_num": 1,
- "output_worker_num": 5
-}
diff --git a/scripts/deploy/config/fairrl.config
b/scripts/deploy/config/fairrl.config
deleted file mode 100644
index f452043b..00000000
--- a/scripts/deploy/config/fairrl.config
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "clientBatchNum": 400,
- "enable_viewchange": false,
- "recovery_enabled": false,
- "max_client_complaint_num":10,
- "max_process_txn": 128,
- "worker_num": 2,
- "input_worker_num": 1,
- "output_worker_num": 5
-}
diff --git a/scripts/deploy/config/hs.config b/scripts/deploy/config/hs.config
deleted file mode 100644
index 0024349d..00000000
--- a/scripts/deploy/config/hs.config
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "clientBatchNum": 300,
- "enable_viewchange": false,
- "recovery_enabled": false,
- "max_client_complaint_num":10,
- "max_process_txn": 8,
- "worker_num": 2,
- "input_worker_num": 1,
- "output_worker_num": 10,
- "multiply_primary": true
-}
diff --git a/scripts/deploy/config/kv_performance_server.conf
b/scripts/deploy/config/kv_performance_server.conf
index 98253c0a..1fa02d13 100644
--- a/scripts/deploy/config/kv_performance_server.conf
+++ b/scripts/deploy/config/kv_performance_server.conf
@@ -1,8 +1,9 @@
iplist=(
-172.31.25.232
-172.31.17.37
-172.31.30.17
-172.31.27.41
+172.31.25.4
+172.31.27.205
+172.31.27.141
+172.31.20.222
+172.31.28.162
)
client_num=1
diff --git a/scripts/deploy/config/kv_performance_server_128.conf
b/scripts/deploy/config/kv_performance_server_128.conf
deleted file mode 100644
index 38109f20..00000000
--- a/scripts/deploy/config/kv_performance_server_128.conf
+++ /dev/null
@@ -1,262 +0,0 @@
-iplist=(
-172.31.25.224
-172.31.20.228
-172.31.18.224
-172.31.16.230
-172.31.31.229
-172.31.26.233
-172.31.29.231
-172.31.17.244
-172.31.17.236
-172.31.26.249
-172.31.18.247
-172.31.16.151
-172.31.31.151
-172.31.31.155
-172.31.17.155
-172.31.22.98
-172.31.19.156
-172.31.22.106
-172.31.24.98
-172.31.23.110
-172.31.27.109
-172.31.31.111
-172.31.28.110
-172.31.20.117
-172.31.30.116
-172.31.16.120
-172.31.28.119
-172.31.27.136
-172.31.20.133
-172.31.22.136
-172.31.26.136
-172.31.30.139
-172.31.21.137
-172.31.16.140
-172.31.26.139
-172.31.21.141
-172.31.27.140
-172.31.24.142
-172.31.31.142
-172.31.31.146
-172.31.19.145
-172.31.23.149
-172.31.30.149
-172.31.22.218
-172.31.17.214
-172.31.30.221
-172.31.24.220
-172.31.29.162
-172.31.24.221
-172.31.19.167
-172.31.21.166
-172.31.27.178
-172.31.18.177
-172.31.17.183
-172.31.21.179
-172.31.26.129
-172.31.16.190
-172.31.27.133
-172.31.29.133
-172.31.19.250
-172.31.27.250
-172.31.16.251
-172.31.26.250
-172.31.29.254
-172.31.21.252
-172.31.25.199
-172.31.23.195
-172.31.25.200
-172.31.28.199
-172.31.19.203
-172.31.28.201
-172.31.23.204
-172.31.26.203
-172.31.18.213
-172.31.19.208
-172.31.27.27
-172.31.17.24
-172.31.21.30
-172.31.25.29
-172.31.29.31
-172.31.21.54
-172.31.22.53
-172.31.27.60
-172.31.23.56
-172.31.25.63
-172.31.30.61
-172.31.27.2
-172.31.28.0
-172.31.26.4
-172.31.31.3
-172.31.20.8
-172.31.24.6
-172.31.23.21
-172.31.26.11
-172.31.29.23
-172.31.31.21
-172.31.25.82
-172.31.20.81
-172.31.25.87
-172.31.27.85
-172.31.26.93
-172.31.16.90
-172.31.24.94
-172.31.26.94
-172.31.19.95
-172.31.17.94
-172.31.30.44
-172.31.21.33
-172.31.26.47
-172.31.27.47
-172.31.26.50
-172.31.22.49
-172.31.19.122
-172.31.31.121
-172.31.24.127
-172.31.24.126
-172.31.21.65
-172.31.26.65
-172.31.29.70
-172.31.22.66
-172.31.19.72
-172.31.26.70
-172.31.22.74
-172.31.23.72
-172.31.27.76
-172.31.24.75
-172.31.19.81
-172.31.16.81
-172.31.47.249
-172.31.36.247
-172.31.40.246
-172.31.38.242
-172.31.46.241
-172.31.43.240
-172.31.34.239
-172.31.39.239
-172.31.33.198
-172.31.35.197
-172.31.39.194
-172.31.44.252
-172.31.42.252
-172.31.35.251
-172.31.47.251
-172.31.36.250
-172.31.35.223
-172.31.39.222
-172.31.44.219
-172.31.34.219
-172.31.32.217
-172.31.36.216
-172.31.32.212
-172.31.33.208
-172.31.39.186
-172.31.32.185
-172.31.38.183
-172.31.32.174
-172.31.41.172
-172.31.43.168
-172.31.39.167
-172.31.32.160
-172.31.43.146
-172.31.32.145
-172.31.33.135
-172.31.37.134
-172.31.42.132
-172.31.32.190
-172.31.36.190
-172.31.36.188
-172.31.36.97
-172.31.39.97
-172.31.35.97
-172.31.43.156
-172.31.47.155
-172.31.40.150
-172.31.44.149
-172.31.47.148
-172.31.36.111
-172.31.43.108
-172.31.39.107
-172.31.45.106
-172.31.34.104
-172.31.37.104
-172.31.37.102
-172.31.41.98
-172.31.43.121
-172.31.37.120
-172.31.43.119
-172.31.42.116
-172.31.37.116
-172.31.47.116
-172.31.34.115
-172.31.37.111
-172.31.47.231
-172.31.45.230
-172.31.39.230
-172.31.45.229
-172.31.40.228
-172.31.46.227
-172.31.38.227
-172.31.46.71
-172.31.45.71
-172.31.34.70
-172.31.40.68
-172.31.47.127
-172.31.32.127
-172.31.45.126
-172.31.47.125
-172.31.38.94
-172.31.39.90
-172.31.41.85
-172.31.47.85
-172.31.39.81
-172.31.42.76
-172.31.47.76
-172.31.32.75
-172.31.40.35
-172.31.46.35
-172.31.47.35
-172.31.40.34
-172.31.38.34
-172.31.45.33
-172.31.47.33
-172.31.39.95
-172.31.43.47
-172.31.40.47
-172.31.45.46
-172.31.34.43
-172.31.46.41
-172.31.38.41
-172.31.39.37
-172.31.38.36
-172.31.45.5
-172.31.38.3
-172.31.36.63
-172.31.44.53
-172.31.47.52
-172.31.35.49
-172.31.40.49
-172.31.34.49
-172.31.47.17
-172.31.46.15
-172.31.37.13
-172.31.38.13
-172.31.46.10
-172.31.35.9
-172.31.33.9
-172.31.38.7
-172.31.35.31
-172.31.34.30
-172.31.43.29
-172.31.47.28
-172.31.45.25
-172.31.44.22
-172.31.33.21
-172.31.47.19
-172.31.37.31
-
-)
-
-key=~/.ssh/junchao.pem
-client_num=128
diff --git a/scripts/deploy/config/kv_performance_server_128_small.conf
b/scripts/deploy/config/kv_performance_server_128_small.conf
deleted file mode 100644
index 05efa707..00000000
--- a/scripts/deploy/config/kv_performance_server_128_small.conf
+++ /dev/null
@@ -1,261 +0,0 @@
-iplist=(
-172.31.25.224
-172.31.20.228
-172.31.18.224
-172.31.16.230
-172.31.31.229
-172.31.26.233
-172.31.29.231
-172.31.17.244
-172.31.17.236
-172.31.26.249
-172.31.18.247
-172.31.16.151
-172.31.31.151
-172.31.31.155
-172.31.17.155
-172.31.22.98
-172.31.19.156
-172.31.22.106
-172.31.24.98
-172.31.23.110
-172.31.27.109
-172.31.31.111
-172.31.28.110
-172.31.20.117
-172.31.30.116
-172.31.16.120
-172.31.28.119
-172.31.27.136
-172.31.20.133
-172.31.22.136
-172.31.26.136
-172.31.30.139
-172.31.21.137
-172.31.16.140
-172.31.26.139
-172.31.21.141
-172.31.27.140
-172.31.24.142
-172.31.31.142
-172.31.31.146
-172.31.19.145
-172.31.23.149
-172.31.30.149
-172.31.22.218
-172.31.17.214
-172.31.30.221
-172.31.24.220
-172.31.29.162
-172.31.24.221
-172.31.19.167
-172.31.21.166
-172.31.27.178
-172.31.18.177
-172.31.17.183
-172.31.21.179
-172.31.26.129
-172.31.16.190
-172.31.27.133
-172.31.29.133
-172.31.19.250
-172.31.27.250
-172.31.16.251
-172.31.26.250
-172.31.29.254
-172.31.21.252
-172.31.25.199
-172.31.23.195
-172.31.25.200
-172.31.28.199
-172.31.19.203
-172.31.28.201
-172.31.23.204
-172.31.26.203
-172.31.18.213
-172.31.19.208
-172.31.27.27
-172.31.17.24
-172.31.21.30
-172.31.25.29
-172.31.29.31
-172.31.21.54
-172.31.22.53
-172.31.27.60
-172.31.23.56
-172.31.25.63
-172.31.30.61
-172.31.27.2
-172.31.28.0
-172.31.26.4
-172.31.31.3
-172.31.20.8
-172.31.24.6
-172.31.23.21
-172.31.26.11
-172.31.29.23
-172.31.31.21
-172.31.25.82
-172.31.20.81
-172.31.25.87
-172.31.27.85
-172.31.26.93
-172.31.16.90
-172.31.24.94
-172.31.26.94
-172.31.19.95
-172.31.17.94
-172.31.30.44
-172.31.21.33
-172.31.26.47
-172.31.27.47
-172.31.26.50
-172.31.22.49
-172.31.19.122
-172.31.31.121
-172.31.24.127
-172.31.24.126
-172.31.21.65
-172.31.26.65
-172.31.29.70
-172.31.22.66
-172.31.19.72
-172.31.26.70
-172.31.22.74
-172.31.23.72
-172.31.27.76
-172.31.24.75
-172.31.19.81
-172.31.16.81
-172.31.35.29
-172.31.39.3
-172.31.37.1
-172.31.38.59
-172.31.41.56
-172.31.47.53
-172.31.46.47
-172.31.36.45
-172.31.44.45
-172.31.43.21
-172.31.40.17
-172.31.39.16
-172.31.34.14
-172.31.44.12
-172.31.44.8
-172.31.34.6
-172.31.33.5
-172.31.37.85
-172.31.42.84
-172.31.36.83
-172.31.47.82
-172.31.32.82
-172.31.46.80
-172.31.34.79
-172.31.32.79
-172.31.35.44
-172.31.42.39
-172.31.35.39
-172.31.34.37
-172.31.35.36
-172.31.41.32
-172.31.44.91
-172.31.43.89
-172.31.46.126
-172.31.41.120
-172.31.47.120
-172.31.41.118
-172.31.40.118
-172.31.43.116
-172.31.34.116
-172.31.47.111
-172.31.47.78
-172.31.44.75
-172.31.34.75
-172.31.35.72
-172.31.33.71
-172.31.41.71
-172.31.35.68
-172.31.47.64
-172.31.40.98
-172.31.36.158
-172.31.35.157
-172.31.33.156
-172.31.36.154
-172.31.32.153
-172.31.35.153
-172.31.45.153
-172.31.33.110
-172.31.47.108
-172.31.45.105
-172.31.45.104
-172.31.41.104
-172.31.41.101
-172.31.40.99
-172.31.43.98
-172.31.40.138
-172.31.46.137
-172.31.45.137
-172.31.43.132
-172.31.39.131
-172.31.33.131
-172.31.46.130
-172.31.34.129
-172.31.39.153
-172.31.37.152
-172.31.34.151
-172.31.43.148
-172.31.45.141
-172.31.39.140
-172.31.41.139
-172.31.35.139
-172.31.39.178
-172.31.39.177
-172.31.47.176
-172.31.37.176
-172.31.43.175
-172.31.33.173
-172.31.46.170
-172.31.33.169
-172.31.38.190
-172.31.35.188
-172.31.44.187
-172.31.38.185
-172.31.35.183
-172.31.39.182
-172.31.36.182
-172.31.43.179
-172.31.40.220
-172.31.37.219
-172.31.32.215
-172.31.46.215
-172.31.40.215
-172.31.42.214
-172.31.41.212
-172.31.39.207
-172.31.37.166
-172.31.34.163
-172.31.37.162
-172.31.43.162
-172.31.36.161
-172.31.39.160
-172.31.36.223
-172.31.44.221
-172.31.32.248
-172.31.41.246
-172.31.35.246
-172.31.44.245
-172.31.44.243
-172.31.43.235
-172.31.44.226
-172.31.42.206
-172.31.33.204
-172.31.45.199
-172.31.44.196
-172.31.35.194
-172.31.39.193
-172.31.36.254
-172.31.40.252
-)
-
-key=~/.ssh/junchao.pem
-client_num=128
diff --git a/scripts/deploy/config/kv_performance_server_16.conf
b/scripts/deploy/config/kv_performance_server_16.conf
deleted file mode 100644
index 449975a5..00000000
--- a/scripts/deploy/config/kv_performance_server_16.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-iplist=(
-172.31.34.134
-172.31.47.133
-172.31.34.148
-172.31.47.146
-172.31.39.188
-172.31.34.186
-172.31.35.3
-172.31.41.128
-172.31.32.56
-172.31.41.54
-172.31.45.58
-172.31.39.58
-172.31.40.181
-172.31.47.180
-172.31.33.182
-172.31.37.182
-172.31.39.45
-172.31.42.170
-172.31.35.50
-172.31.41.50
-172.31.47.38
-172.31.42.164
-172.31.33.42
-172.31.45.40
-172.31.43.95
-172.31.46.88
-172.31.35.163
-172.31.39.162
-172.31.34.84
-172.31.32.80
-172.31.42.216
-172.31.39.84
-)
-
-
-key=~/.ssh/junchao.pem
-client_num=16
-
diff --git a/scripts/deploy/config/kv_performance_server_16_2.conf
b/scripts/deploy/config/kv_performance_server_16_2.conf
deleted file mode 100644
index e77ce569..00000000
--- a/scripts/deploy/config/kv_performance_server_16_2.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-iplist=(
-172.31.25.224
-172.31.20.228
-172.31.18.224
-172.31.16.230
-172.31.31.229
-172.31.26.233
-172.31.29.231
-172.31.17.244
-172.31.17.236
-172.31.26.249
-172.31.18.247
-172.31.16.151
-172.31.31.151
-172.31.31.155
-172.31.17.155
-172.31.22.98
-172.31.19.156
-172.31.22.106
-172.31.24.98
-172.31.23.110
-172.31.27.109
-172.31.31.111
-172.31.28.110
-172.31.20.117
-172.31.30.116
-172.31.16.120
-172.31.28.119
-172.31.27.136
-172.31.20.133
-172.31.22.136
-172.31.26.136
-172.31.30.139
-172.31.21.137
-172.31.16.140
-172.31.26.139
-172.31.21.141
-172.31.27.140
-172.31.24.142
-172.31.31.142
-172.31.31.146
-172.31.19.145
-172.31.23.149
-172.31.30.149
-172.31.22.218
-172.31.17.214
-172.31.30.221
-172.31.24.220
-172.31.29.162
-)
-
-key=~/.ssh/junchao.pem
-client_num=32
diff --git a/scripts/deploy/config/kv_performance_server_32.conf
b/scripts/deploy/config/kv_performance_server_32.conf
deleted file mode 100644
index 1805489b..00000000
--- a/scripts/deploy/config/kv_performance_server_32.conf
+++ /dev/null
@@ -1,69 +0,0 @@
-iplist=(
-172.31.34.134
-172.31.47.133
-172.31.34.148
-172.31.47.146
-172.31.39.188
-172.31.34.186
-172.31.35.3
-172.31.41.128
-172.31.32.56
-172.31.41.54
-172.31.45.58
-172.31.39.58
-172.31.40.181
-172.31.47.180
-172.31.33.182
-172.31.37.182
-172.31.39.45
-172.31.42.170
-172.31.35.50
-172.31.41.50
-172.31.47.38
-172.31.42.164
-172.31.33.42
-172.31.45.40
-172.31.43.95
-172.31.46.88
-172.31.35.163
-172.31.39.162
-172.31.34.84
-172.31.32.80
-172.31.42.216
-172.31.39.84
-172.31.32.71
-172.31.36.196
-172.31.40.78
-172.31.38.76
-172.31.40.255
-172.31.34.127
-172.31.45.194
-172.31.32.64
-172.31.36.251
-172.31.42.249
-172.31.45.127
-172.31.47.125
-172.31.45.113
-172.31.45.240
-172.31.42.118
-172.31.37.113
-172.31.35.109
-172.31.42.236
-172.31.47.239
-172.31.38.238
-172.31.43.228
-172.31.38.99
-172.31.38.107
-172.31.40.104
-172.31.43.98
-172.31.35.157
-172.31.33.28
-172.31.32.31
-172.31.44.150
-172.31.42.150
-172.31.42.153
-172.31.42.151
-)
-
-key=~/.ssh/junchao.pem
-client_num=32
diff --git a/scripts/deploy/config/kv_performance_server_48.conf
b/scripts/deploy/config/kv_performance_server_48.conf
deleted file mode 100644
index 08d64050..00000000
--- a/scripts/deploy/config/kv_performance_server_48.conf
+++ /dev/null
@@ -1,101 +0,0 @@
-iplist=(
-172.31.34.134
-172.31.47.133
-172.31.34.148
-172.31.47.146
-172.31.39.188
-172.31.34.186
-172.31.35.3
-172.31.41.128
-172.31.32.56
-172.31.41.54
-172.31.45.58
-172.31.39.58
-172.31.40.181
-172.31.47.180
-172.31.33.182
-172.31.37.182
-172.31.39.45
-172.31.42.170
-172.31.35.50
-172.31.41.50
-172.31.47.38
-172.31.42.164
-172.31.33.42
-172.31.45.40
-172.31.43.95
-172.31.46.88
-172.31.35.163
-172.31.39.162
-172.31.34.84
-172.31.32.80
-172.31.42.216
-172.31.39.84
-172.31.32.71
-172.31.36.196
-172.31.40.78
-172.31.38.76
-172.31.40.255
-172.31.34.127
-172.31.45.194
-172.31.32.64
-172.31.36.251
-172.31.42.249
-172.31.45.127
-172.31.47.125
-172.31.45.113
-172.31.45.240
-172.31.42.118
-172.31.37.113
-172.31.35.109
-172.31.42.236
-172.31.47.239
-172.31.38.238
-172.31.43.228
-172.31.38.99
-172.31.38.107
-172.31.40.104
-172.31.43.98
-172.31.35.157
-172.31.33.28
-172.31.32.31
-172.31.44.150
-172.31.42.150
-172.31.42.153
-172.31.42.151
-172.31.43.30
-172.31.40.21
-172.31.38.147
-172.31.41.29
-172.31.47.21
-172.31.39.3
-172.31.42.131
-172.31.45.18
-172.31.40.140
-172.31.32.189
-172.31.46.58
-172.31.33.0
-172.31.33.190
-172.31.38.179
-172.31.46.178
-172.31.36.186
-172.31.42.183
-172.31.41.47
-172.31.32.47
-172.31.33.178
-172.31.42.176
-172.31.32.172
-172.31.35.39
-172.31.35.47
-172.31.40.173
-172.31.45.162
-172.31.33.162
-172.31.34.167
-172.31.33.164
-172.31.37.96
-172.31.38.226
-172.31.41.225
-)
-
-key=~/.ssh/junchao.pem
-client_num=48
diff --git a/scripts/deploy/config/kv_performance_server_64.conf
b/scripts/deploy/config/kv_performance_server_64.conf
deleted file mode 100644
index a5ef0baf..00000000
--- a/scripts/deploy/config/kv_performance_server_64.conf
+++ /dev/null
@@ -1,133 +0,0 @@
-iplist=(
-172.31.34.134
-172.31.47.133
-172.31.34.148
-172.31.47.146
-172.31.39.188
-172.31.34.186
-172.31.35.3
-172.31.41.128
-172.31.32.56
-172.31.41.54
-172.31.45.58
-172.31.39.58
-172.31.40.181
-172.31.47.180
-172.31.33.182
-172.31.37.182
-172.31.39.45
-172.31.42.170
-172.31.35.50
-172.31.41.50
-172.31.47.38
-172.31.42.164
-172.31.33.42
-172.31.45.40
-172.31.43.95
-172.31.46.88
-172.31.35.163
-172.31.39.162
-172.31.34.84
-172.31.32.80
-172.31.42.216
-172.31.39.84
-172.31.32.71
-172.31.36.196
-172.31.40.78
-172.31.38.76
-172.31.40.255
-172.31.34.127
-172.31.45.194
-172.31.32.64
-172.31.36.251
-172.31.42.249
-172.31.45.127
-172.31.47.125
-172.31.45.113
-172.31.45.240
-172.31.42.118
-172.31.37.113
-172.31.35.109
-172.31.42.236
-172.31.47.239
-172.31.38.238
-172.31.43.228
-172.31.38.99
-172.31.38.107
-172.31.40.104
-172.31.43.98
-172.31.35.157
-172.31.33.28
-172.31.32.31
-172.31.44.150
-172.31.42.150
-172.31.42.153
-172.31.42.151
-172.31.43.30
-172.31.40.21
-172.31.38.147
-172.31.41.29
-172.31.47.21
-172.31.39.3
-172.31.42.131
-172.31.45.18
-172.31.40.140
-172.31.32.189
-172.31.46.58
-172.31.33.0
-172.31.33.190
-172.31.38.179
-172.31.46.178
-172.31.36.186
-172.31.42.183
-172.31.41.47
-172.31.32.47
-172.31.33.178
-172.31.42.176
-172.31.32.172
-172.31.35.39
-172.31.35.47
-172.31.40.173
-172.31.45.162
-172.31.33.162
-172.31.34.167
-172.31.33.164
-172.31.37.96
-172.31.38.226
-172.31.41.225
-172.31.35.90
-172.31.41.89
-172.31.37.95
-172.31.38.218
-172.31.32.86
-172.31.39.81
-172.31.47.87
-172.31.38.87
-172.31.41.204
-172.31.33.204
-172.31.42.205
-172.31.33.77
-172.31.41.71
-172.31.34.198
-172.31.35.75
-172.31.36.201
-172.31.38.198
-172.31.44.192
-172.31.47.198
-172.31.45.198
-172.31.39.122
-172.31.38.243
-172.31.44.255
-172.31.34.125
-172.31.47.106
-172.31.32.234
-172.31.34.110
-172.31.41.109
-172.31.41.228
-172.31.33.99
-172.31.40.234
-172.31.45.230
-)
-
-key=~/.ssh/junchao.pem
-client_num=64
diff --git a/scripts/deploy/config/kv_performance_server_8.conf
b/scripts/deploy/config/kv_performance_server_8.conf
deleted file mode 100644
index 5247ee43..00000000
--- a/scripts/deploy/config/kv_performance_server_8.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-iplist=(
-172.31.26.97
-172.31.19.225
-172.31.27.226
-172.31.23.230
-172.31.31.233
-172.31.18.107
-172.31.21.236
-172.31.23.236
-172.31.31.224
-172.31.28.224
-172.31.20.215
-172.31.31.215
-172.31.17.87
-172.31.18.218
-172.31.27.90
-172.31.18.92
-172.31.16.221
-172.31.23.95
-172.31.23.73
-172.31.31.75
-172.31.16.204
-172.31.26.209
-172.31.22.210
-172.31.26.211
-)
-
-client_num=16
diff --git a/scripts/deploy/config/kv_performance_server_small_128.conf
b/scripts/deploy/config/kv_performance_server_small_128.conf
deleted file mode 100644
index af9522d3..00000000
--- a/scripts/deploy/config/kv_performance_server_small_128.conf
+++ /dev/null
@@ -1,261 +0,0 @@
-iplist=(
-172.31.41.159
-172.31.37.96
-172.31.45.102
-172.31.41.102
-172.31.39.152
-172.31.43.155
-172.31.45.156
-172.31.45.157
-172.31.37.117
-172.31.45.118
-172.31.37.119
-172.31.39.120
-172.31.37.103
-172.31.45.103
-172.31.47.105
-172.31.37.115
-172.31.45.124
-172.31.33.126
-172.31.35.64
-172.31.37.65
-172.31.39.121
-172.31.37.121
-172.31.33.123
-172.31.45.123
-172.31.35.81
-172.31.37.83
-172.31.39.88
-172.31.43.89
-172.31.33.65
-172.31.47.70
-172.31.45.70
-172.31.39.77
-172.31.39.33
-172.31.35.34
-172.31.37.35
-172.31.33.40
-172.31.35.90
-172.31.41.91
-172.31.43.93
-172.31.41.93
-172.31.37.46
-172.31.45.50
-172.31.39.54
-172.31.47.58
-172.31.35.41
-172.31.45.42
-172.31.39.42
-172.31.41.44
-172.31.47.0
-172.31.39.0
-172.31.43.3
-172.31.37.12
-172.31.41.60
-172.31.47.60
-172.31.45.62
-172.31.33.0
-172.31.37.20
-172.31.47.24
-172.31.35.30
-172.31.43.30
-172.31.47.14
-172.31.45.15
-172.31.37.17
-172.31.45.19
-172.31.32.227
-172.31.40.229
-172.31.44.232
-172.31.44.234
-172.31.39.30
-172.31.43.31
-172.31.32.225
-172.31.38.225
-172.31.32.243
-172.31.34.243
-172.31.32.247
-172.31.40.252
-172.31.46.234
-172.31.40.235
-172.31.34.235
-172.31.32.242
-172.31.32.196
-172.31.32.201
-172.31.36.204
-172.31.36.208
-172.31.34.253
-172.31.34.254
-172.31.44.254
-172.31.40.193
-172.31.38.165
-172.31.36.172
-172.31.40.172
-172.31.32.173
-172.31.40.210
-172.31.34.212
-172.31.38.215
-172.31.46.216
-172.31.40.175
-172.31.38.176
-172.31.38.178
-172.31.34.128
-172.31.44.173
-172.31.38.173
-172.31.44.174
-172.31.42.174
-172.31.38.136
-172.31.36.141
-172.31.46.141
-172.31.42.147
-172.31.34.130
-172.31.40.130
-172.31.46.132
-172.31.32.135
-172.31.38.151
-172.31.32.151
-172.31.44.152
-172.31.40.153
-172.31.40.147
-172.31.42.149
-172.31.46.149
-172.31.32.150
-172.31.46.96
-172.31.34.98
-172.31.44.100
-172.31.46.102
-172.31.40.154
-172.31.38.156
-172.31.38.158
-172.31.36.159
-172.31.34.113
-172.31.46.113
-172.31.38.118
-172.31.40.119
-172.31.40.104
-172.31.42.105
-172.31.34.106
-172.31.36.106
-172.31.36.125
-172.31.46.69
-172.31.42.70
-172.31.44.72
-172.31.44.123
-172.31.40.124
-172.31.38.124
-172.31.36.124
-172.31.36.76
-172.31.40.77
-172.31.46.78
-172.31.44.78
-172.31.32.72
-172.31.44.73
-172.31.32.73
-172.31.32.74
-172.31.44.85
-172.31.38.86
-172.31.46.87
-172.31.36.88
-172.31.36.80
-172.31.36.82
-172.31.42.83
-172.31.32.84
-172.31.44.92
-172.31.34.92
-172.31.42.94
-172.31.32.95
-172.31.46.89
-172.31.34.90
-172.31.46.91
-172.31.34.91
-172.31.46.39
-172.31.40.39
-172.31.42.41
-172.31.44.46
-172.31.42.34
-172.31.38.35
-172.31.42.36
-172.31.38.39
-172.31.32.63
-172.31.46.0
-172.31.40.2
-172.31.38.2
-172.31.46.54
-172.31.32.55
-172.31.40.56
-172.31.34.57
-172.31.34.7
-172.31.42.12
-172.31.36.12
-172.31.34.16
-172.31.36.3
-172.31.42.3
-172.31.42.5
-172.31.38.5
-172.31.36.26
-172.31.42.27
-172.31.38.27
-172.31.42.28
-172.31.44.19
-172.31.38.20
-172.31.34.21
-172.31.32.23
-172.31.43.233
-172.31.47.235
-172.31.37.235
-172.31.39.236
-172.31.41.226
-172.31.47.229
-172.31.41.229
-172.31.47.230
-172.31.35.245
-172.31.33.246
-172.31.45.248
-172.31.41.252
-172.31.33.236
-172.31.45.238
-172.31.35.242
-172.31.47.242
-172.31.45.192
-172.31.47.199
-172.31.45.202
-172.31.35.203
-172.31.47.253
-172.31.45.253
-172.31.37.253
-172.31.35.255
-172.31.45.208
-172.31.43.218
-172.31.45.218
-172.31.47.222
-172.31.47.203
-172.31.45.204
-172.31.41.207
-172.31.47.207
-172.31.33.165
-172.31.43.171
-172.31.37.173
-172.31.39.174
-172.31.33.160
-172.31.33.162
-172.31.45.163
-172.31.37.164
-172.31.45.183
-172.31.41.184
-172.31.41.188
-172.31.43.131
-172.31.41.175
-172.31.45.178
-172.31.33.180
-172.31.33.181
-172.31.39.135
-172.31.47.135
-172.31.37.138
-172.31.45.149
-172.31.39.132
-172.31.35.132
-172.31.33.133
-172.31.41.134
-)
-
-key=~/.ssh/junchao.pem
-client_num=128
diff --git a/scripts/deploy/config/kv_performance_server_small_16.conf
b/scripts/deploy/config/kv_performance_server_small_16.conf
deleted file mode 100644
index ec34db0a..00000000
--- a/scripts/deploy/config/kv_performance_server_small_16.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-iplist=(
-172.31.41.159
-172.31.37.96
-172.31.45.102
-172.31.41.102
-172.31.39.152
-172.31.43.155
-172.31.45.156
-172.31.45.157
-172.31.37.117
-172.31.45.118
-172.31.37.119
-172.31.39.120
-172.31.37.103
-172.31.45.103
-172.31.47.105
-172.31.37.115
-172.31.45.124
-172.31.33.126
-172.31.35.64
-172.31.37.65
-172.31.39.121
-172.31.37.121
-172.31.33.123
-172.31.45.123
-172.31.35.81
-172.31.37.83
-172.31.39.88
-172.31.43.89
-172.31.33.65
-172.31.47.70
-172.31.45.70
-172.31.39.77
-)
-
-key=~/.ssh/junchao.pem
-client_num=16
diff --git a/scripts/deploy/config/kv_performance_server_small_32.conf
b/scripts/deploy/config/kv_performance_server_small_32.conf
deleted file mode 100644
index 88424ea5..00000000
--- a/scripts/deploy/config/kv_performance_server_small_32.conf
+++ /dev/null
@@ -1,69 +0,0 @@
-iplist=(
-172.31.41.159
-172.31.37.96
-172.31.45.102
-172.31.41.102
-172.31.39.152
-172.31.43.155
-172.31.45.156
-172.31.45.157
-172.31.37.117
-172.31.45.118
-172.31.37.119
-172.31.39.120
-172.31.37.103
-172.31.45.103
-172.31.47.105
-172.31.37.115
-172.31.45.124
-172.31.33.126
-172.31.35.64
-172.31.37.65
-172.31.39.121
-172.31.37.121
-172.31.33.123
-172.31.45.123
-172.31.35.81
-172.31.37.83
-172.31.39.88
-172.31.43.89
-172.31.33.65
-172.31.47.70
-172.31.45.70
-172.31.39.77
-172.31.39.33
-172.31.35.34
-172.31.37.35
-172.31.33.40
-172.31.35.90
-172.31.41.91
-172.31.43.93
-172.31.41.93
-172.31.37.46
-172.31.45.50
-172.31.39.54
-172.31.47.58
-172.31.35.41
-172.31.45.42
-172.31.39.42
-172.31.41.44
-172.31.47.0
-172.31.39.0
-172.31.43.3
-172.31.37.12
-172.31.41.60
-172.31.47.60
-172.31.45.62
-172.31.33.0
-172.31.37.20
-172.31.47.24
-172.31.35.30
-172.31.43.30
-172.31.47.14
-172.31.45.15
-172.31.37.17
-172.31.45.19
-)
-
-key=~/.ssh/junchao.pem
-client_num=32
diff --git a/scripts/deploy/config/kv_performance_server_small_64.conf
b/scripts/deploy/config/kv_performance_server_small_64.conf
deleted file mode 100644
index 0a176d2e..00000000
--- a/scripts/deploy/config/kv_performance_server_small_64.conf
+++ /dev/null
@@ -1,133 +0,0 @@
-iplist=(
-172.31.41.159
-172.31.37.96
-172.31.45.102
-172.31.41.102
-172.31.39.152
-172.31.43.155
-172.31.45.156
-172.31.45.157
-172.31.37.117
-172.31.45.118
-172.31.37.119
-172.31.39.120
-172.31.37.103
-172.31.45.103
-172.31.47.105
-172.31.37.115
-172.31.45.124
-172.31.33.126
-172.31.35.64
-172.31.37.65
-172.31.39.121
-172.31.37.121
-172.31.33.123
-172.31.45.123
-172.31.35.81
-172.31.37.83
-172.31.39.88
-172.31.43.89
-172.31.33.65
-172.31.47.70
-172.31.45.70
-172.31.39.77
-172.31.39.33
-172.31.35.34
-172.31.37.35
-172.31.33.40
-172.31.35.90
-172.31.41.91
-172.31.43.93
-172.31.41.93
-172.31.37.46
-172.31.45.50
-172.31.39.54
-172.31.47.58
-172.31.35.41
-172.31.45.42
-172.31.39.42
-172.31.41.44
-172.31.47.0
-172.31.39.0
-172.31.43.3
-172.31.37.12
-172.31.41.60
-172.31.47.60
-172.31.45.62
-172.31.33.0
-172.31.37.20
-172.31.47.24
-172.31.35.30
-172.31.43.30
-172.31.47.14
-172.31.45.15
-172.31.37.17
-172.31.45.19
-172.31.32.227
-172.31.40.229
-172.31.44.232
-172.31.44.234
-172.31.39.30
-172.31.43.31
-172.31.32.225
-172.31.38.225
-172.31.32.243
-172.31.34.243
-172.31.32.247
-172.31.40.252
-172.31.46.234
-172.31.40.235
-172.31.34.235
-172.31.32.242
-172.31.32.196
-172.31.32.201
-172.31.36.204
-172.31.36.208
-172.31.34.253
-172.31.34.254
-172.31.44.254
-172.31.40.193
-172.31.38.165
-172.31.36.172
-172.31.40.172
-172.31.32.173
-172.31.40.210
-172.31.34.212
-172.31.38.215
-172.31.46.216
-172.31.40.175
-172.31.38.176
-172.31.38.178
-172.31.34.128
-172.31.44.173
-172.31.38.173
-172.31.44.174
-172.31.42.174
-172.31.38.136
-172.31.36.141
-172.31.46.141
-172.31.42.147
-172.31.34.130
-172.31.40.130
-172.31.46.132
-172.31.32.135
-172.31.38.151
-172.31.32.151
-172.31.44.152
-172.31.40.153
-172.31.40.147
-172.31.42.149
-172.31.46.149
-172.31.32.150
-172.31.46.96
-172.31.34.98
-172.31.44.100
-172.31.46.102
-172.31.40.154
-172.31.38.156
-172.31.38.158
-172.31.36.159
-)
-
-key=~/.ssh/junchao.pem
-client_num=64
diff --git a/scripts/deploy/config/kv_performance_server_small_8.conf
b/scripts/deploy/config/kv_performance_server_small_8.conf
deleted file mode 100644
index 3a807201..00000000
--- a/scripts/deploy/config/kv_performance_server_small_8.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-iplist=(
-172.31.41.159
-172.31.37.96
-172.31.45.102
-172.31.41.102
-172.31.39.152
-172.31.43.155
-172.31.45.156
-172.31.45.157
-172.31.37.117
-172.31.45.118
-172.31.37.119
-172.31.39.120
-172.31.37.103
-172.31.45.103
-172.31.47.105
-172.31.37.115
-)
-
-client_num=8
diff --git a/scripts/deploy/config/kv_performance_server_test_5.conf
b/scripts/deploy/config/kv_performance_server_test_5.conf
deleted file mode 100644
index f064b830..00000000
--- a/scripts/deploy/config/kv_performance_server_test_5.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-iplist=(
-172.31.66.2
-172.31.72.164
-172.31.73.238
-172.31.77.118
-172.31.74.248
-)
-
-key=~/.ssh/junchao.pem
-client_num=1
diff --git a/scripts/deploy/config/kv_server.conf
b/scripts/deploy/config/kv_server.conf
index a811f768..833852f4 100644
--- a/scripts/deploy/config/kv_server.conf
+++ b/scripts/deploy/config/kv_server.conf
@@ -1,8 +1,8 @@
iplist=(
-172.31.52.247
-172.31.54.193
-172.31.55.48
-172.31.53.140
-172.31.57.186
+172.31.25.4
+172.31.27.205
+172.31.27.141
+172.31.20.222
+172.31.28.162
)
diff --git a/scripts/deploy/config/pbft.config
b/scripts/deploy/config/pbft.config
index 1be6edbe..93e2ba29 100644
--- a/scripts/deploy/config/pbft.config
+++ b/scripts/deploy/config/pbft.config
@@ -1,12 +1,10 @@
{
"clientBatchNum": 100,
- "enable_viewchange": false,
- "recovery_enabled": false,
+ "enable_viewchange": true,
+ "recovery_enabled": true,
"max_client_complaint_num":10,
- "max_process_txn": 512,
- "worker_num": 6,
+ "max_process_txn": 2048,
+ "worker_num": 2,
"input_worker_num": 1,
- "output_worker_num": 10,
- "water_mark":4096,
- "tcp_batch_num":100
+ "output_worker_num": 10
}
diff --git a/scripts/deploy/config/poe.config b/scripts/deploy/config/poe.config
index d4fea575..c5092a94 100644
--- a/scripts/deploy/config/poe.config
+++ b/scripts/deploy/config/poe.config
@@ -3,11 +3,8 @@
"enable_viewchange": false,
"recovery_enabled": false,
"max_client_complaint_num":10,
- "max_process_txn": 256,
- "worker_num": 6,
+ "max_process_txn": 32,
+ "worker_num": 2,
"input_worker_num": 1,
- "output_worker_num": 10,
- "water_mark": 4096,
- "is_linear": true,
- "tcp_batch_num":100
+ "output_worker_num": 10
}
diff --git a/scripts/deploy/config/poe_performance_server.conf
b/scripts/deploy/config/poe_performance_server.conf
deleted file mode 100644
index 4e19c7d2..00000000
--- a/scripts/deploy/config/poe_performance_server.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-iplist=(
-172.31.14.56
-172.31.5.62
-172.31.8.207
-172.31.12.105
-172.31.3.13
-)
-
-key=~/.ssh/junchao.pem
-export server=//benchmark/protocols/poe:kv_server_performance
diff --git a/scripts/deploy/config/poe_performance_server_nomac.conf
b/scripts/deploy/config/poe_performance_server_nomac.conf
deleted file mode 100644
index 0280ab5b..00000000
--- a/scripts/deploy/config/poe_performance_server_nomac.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-iplist=(
-172.31.14.56
-172.31.5.62
-172.31.8.207
-172.31.12.105
-172.31.3.13
-)
-
-key=~/.ssh/junchao.pem
-export server=//benchmark/protocols/poe:kv_server_performance_nomac
diff --git a/scripts/deploy/config/rcc.config b/scripts/deploy/config/rcc.config
deleted file mode 100644
index db733b91..00000000
--- a/scripts/deploy/config/rcc.config
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "clientBatchNum": 100,
- "enable_viewchange": false,
- "recovery_enabled": false,
- "max_client_complaint_num":10,
- "max_process_txn": 64,
- "worker_num": 30,
- "input_worker_num": 1,
- "output_worker_num": 10
-}
diff --git a/scripts/deploy/config/template.config
b/scripts/deploy/config/template.config
index 9f66f528..7962f6b0 100644
--- a/scripts/deploy/config/template.config
+++ b/scripts/deploy/config/template.config
@@ -1,10 +1,6 @@
{
- "clientBatchNum": 800,
- "enable_viewchange": false,
- "recovery_enabled": false,
- "max_client_complaint_num":10,
- "max_process_txn": 512,
- "worker_num": 16,
- "input_worker_num": 5,
- "output_worker_num": 5
+ "clientBatchNum": 100,
+ "enable_viewchange": true,
+ "recovery_enabled":true,
+ "max_client_complaint_num":10
}
diff --git a/scripts/deploy/config/tusk.config
b/scripts/deploy/config/tusk.config
deleted file mode 100644
index 0e1b2104..00000000
--- a/scripts/deploy/config/tusk.config
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "clientBatchNum": 1000,
- "enable_viewchange": false,
- "recovery_enabled": false,
- "max_client_complaint_num":10,
- "max_process_txn": 128,
- "worker_num": 2,
- "input_worker_num": 1,
- "output_worker_num": 5
-}
diff --git a/scripts/deploy/config/zzy.config b/scripts/deploy/config/zzy.config
deleted file mode 100644
index 4e5c1a06..00000000
--- a/scripts/deploy/config/zzy.config
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "clientBatchNum": 100,
- "enable_viewchange": false,
- "recovery_enabled": false,
- "max_client_complaint_num":10,
- "max_process_txn": 256,
- "worker_num": 6,
- "input_worker_num": 1,
- "output_worker_num": 10,
- "water_mark": 4096,
- "is_linear": true,
- "tcp_batch_num":300
-}
