Skip to content

Commit d5ac4ef

Browse files
committed
added etcd v2 to v3 migration guide to the related section
Signed-off-by: shivamgcodes <shivamguptaxia2@gmail.com> fixed linting errors Signed-off-by: shivamgcodes <shivamguptaxia2@gmail.com> fixed linting errors Signed-off-by: shivamgcodes <shivamguptaxia2@gmail.com>
1 parent 45b43fe commit d5ac4ef

File tree

1 file changed

+9
-33
lines changed

1 file changed

+9
-33
lines changed

content/en/docs/v3.6/upgrades/upgrade_3_6.md

+9-33
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Before [starting an upgrade](#upgrade-procedure), read through the rest of this
2020
Highlighted breaking changes in 3.6.
2121

2222
### Flags added
23+
2324
```diff
2425
+etcd --discovery-token ''
2526
+etcd --discovery-endpoints ''
@@ -37,9 +38,10 @@ Highlighted breaking changes in 3.6.
3738
+etcd --feature-gates
3839
+etcd --log-format
3940
```
41+
4042
### Deprecated flags
41-
**`etcd --experimental-bootstrap-defrag-threshold-megabytes` flag has been deprecated.**
4243

44+
**`etcd --experimental-bootstrap-defrag-threshold-megabytes` flag has been deprecated.**
4345

4446
```diff
4547

@@ -51,7 +53,6 @@ Highlighted breaking changes in 3.6.
5153

5254
**`etcd --experimental-compaction-batch-limit` flag has been deprecated.**
5355

54-
5556
```diff
5657

5758
-etcd --experimental-compaction-batch-limit
@@ -62,7 +63,6 @@ Highlighted breaking changes in 3.6.
6263

6364
**`etcd --experimental-compact-hash-check-time` flag has been deprecated.**
6465

65-
6666
```diff
6767

6868
-etcd --experimental-compact-hash-check-time
@@ -73,7 +73,6 @@ Highlighted breaking changes in 3.6.
7373

7474
**`etcd --experimental-compaction-sleep-interval` flag has been deprecated.**
7575

76-
7776
```diff
7877

7978
-etcd --experimental-compaction-sleep-interval
@@ -84,7 +83,6 @@ Highlighted breaking changes in 3.6.
8483

8584
**`etcd --experimental-corrupt-check-time` flag has been deprecated.**
8685

87-
8886
```diff
8987

9088
-etcd --experimental-corrupt-check-time
@@ -95,7 +93,6 @@ Highlighted breaking changes in 3.6.
9593

9694
**`etcd --experimental-enable-distributed-tracing` flag has been deprecated.**
9795

98-
9996
```diff
10097

10198
-etcd --experimental-enable-distributed-tracing
@@ -106,7 +103,6 @@ Highlighted breaking changes in 3.6.
106103

107104
**`etcd --experimental-distributed-tracing-address` flag has been deprecated.**
108105

109-
110106
```diff
111107

112108
-etcd --experimental-distributed-tracing-address
@@ -117,7 +113,6 @@ Highlighted breaking changes in 3.6.
117113

118114
**`etcd --experimental-distributed-tracing-instance-id` flag has been deprecated.**
119115

120-
121116
```diff
122117

123118
-etcd --experimental-distributed-tracing-instance-id
@@ -128,7 +123,6 @@ Highlighted breaking changes in 3.6.
128123

129124
**`etcd --experimental-distributed-tracing-sampling-rate` flag has been deprecated.**
130125

131-
132126
```diff
133127

134128
-etcd --experimental-distributed-tracing-sampling-rate
@@ -139,7 +133,6 @@ Highlighted breaking changes in 3.6.
139133

140134
**`etcd --experimental-distributed-tracing-service-name` flag has been deprecated.**
141135

142-
143136
```diff
144137

145138
-etcd --experimental-distributed-tracing-service-name
@@ -150,7 +143,6 @@ Highlighted breaking changes in 3.6.
150143

151144
**`etcd --experimental-downgrade-check-time` flag has been deprecated.**
152145

153-
154146
```diff
155147

156148
-etcd --experimental-downgrade-check-time
@@ -161,7 +153,6 @@ Highlighted breaking changes in 3.6.
161153

162154
**`etcd --experimental-max-learners` flag has been deprecated.**
163155

164-
165156
```diff
166157

167158
-etcd --experimental-max-learners
@@ -172,7 +163,6 @@ Highlighted breaking changes in 3.6.
172163

173164
**`etcd --experimental-memory-mlock` flag has been deprecated.**
174165

175-
176166
```diff
177167

178168
-etcd --experimental-memory-mlock
@@ -183,7 +173,6 @@ Highlighted breaking changes in 3.6.
183173

184174
**`etcd --experimental-peer-skip-client-san-verification` flag has been deprecated.**
185175

186-
187176
```diff
188177

189178
-etcd --experimental-peer-skip-client-san-verification
@@ -194,7 +183,6 @@ Highlighted breaking changes in 3.6.
194183

195184
**`etcd --experimental-snapshot-catchup-entries` flag has been deprecated.**
196185

197-
198186
```diff
199187

200188
-etcd --experimental-snapshot-catchup-entries
@@ -205,7 +193,6 @@ Highlighted breaking changes in 3.6.
205193

206194
**`etcd --experimental-warning-apply-duration` flag has been deprecated.**
207195

208-
209196
```diff
210197

211198
-etcd --experimental-warning-apply-duration
@@ -216,7 +203,6 @@ Highlighted breaking changes in 3.6.
216203

217204
**`etcd --experimental-warning-unary-request-duration` flag has been deprecated.**
218205

219-
220206
```diff
221207

222208
-etcd --experimental-warning-unary-request-duration
@@ -227,7 +213,6 @@ Highlighted breaking changes in 3.6.
227213

228214
**`etcd --experimental-watch-progress-notify-interval` flag has been deprecated.**
229215

230-
231216
```diff
232217

233218
-etcd --experimental-watch-progress-notify-interval
@@ -236,11 +221,10 @@ Highlighted breaking changes in 3.6.
236221

237222
```
238223

239-
# Equivalent flags of 3.5 feature gates
224+
### Equivalent flags of 3.5 feature gates
240225

241226
**equivalent flag for feature gate `etcd --experimental-compact-hash-check-enabled=true`**
242227

243-
244228
```diff
245229

246230
-etcd --experimental-compact-hash-check-enabled=true
@@ -251,7 +235,6 @@ Highlighted breaking changes in 3.6.
251235

252236
**equivalent flag for feature gate `etcd --experimental-enable-initial-corrupt-check=true`**
253237

254-
255238
```diff
256239

257240
-etcd --experimental-enable-initial-corrupt-check=true
@@ -262,7 +245,6 @@ Highlighted breaking changes in 3.6.
262245

263246
**equivalent flag for feature gate `etcd --experimental-enable-lease-checkpoint=true`**
264247

265-
266248
```diff
267249

268250
-etcd --experimental-enable-lease-checkpoint=true
@@ -273,7 +255,6 @@ Highlighted breaking changes in 3.6.
273255

274256
**equivalent flag for feature gate `etcd --experimental-enable-lease-checkpoint-persist=true`**
275257

276-
277258
```diff
278259

279260
-etcd --experimental-enable-lease-checkpoint-persist=true
@@ -284,7 +265,6 @@ Highlighted breaking changes in 3.6.
284265

285266
**equivalent flag for feature gate `etcd --experimental-stop-grpc-service-on-defrag=true`**
286267

287-
288268
```diff
289269

290270
-etcd --experimental-stop-grpc-service-on-defrag=true
@@ -295,7 +275,6 @@ Highlighted breaking changes in 3.6.
295275

296276
**equivalent flag for feature gate `etcd --experimental-txn-mode-write-with-shared-buffer=false`**
297277

298-
299278
```diff
300279

301280
-etcd --experimental-txn-mode-write-with-shared-buffer=false
@@ -304,11 +283,10 @@ Highlighted breaking changes in 3.6.
304283

305284
```
306285

307-
# Same flag different defaults
286+
### Same flag different defaults
308287

309288
**Original default flag `etcd --snapshot-count=100000`**
310289

311-
312290
```diff
313291

314292
-etcd --snapshot-count=100000
@@ -319,7 +297,6 @@ Highlighted breaking changes in 3.6.
319297

320298
**Original default flag `etcd --v2-deprecation='not-yet'`**
321299

322-
323300
```diff
324301

325302
-etcd --v2-deprecation='not-yet'
@@ -330,23 +307,22 @@ Highlighted breaking changes in 3.6.
330307

331308
**Original default flag `etcd --discovery-fallback='proxy'`**
332309

333-
334310
```diff
335311

336312
-etcd --discovery-fallback='proxy'
337313

338314
+etcd --discovery-fallback='exit'
339315

340316
```
341-
#### Difference in Prometheus metrics
317+
318+
### Difference in Prometheus metrics
342319

343320
```diff
344321
# metrics added in 3.6
345322
+etcd_network_known_peers
346323
+etcd_server_feature_enabled
347324
```
348325

349-
350326
### Server upgrade checklists
351327

352328
#### Upgrade requirements
@@ -369,7 +345,7 @@ While upgrading, an etcd cluster supports mixed versions of etcd members, and op
369345

370346
If this cluster has been in use since etcd v2, there are some additional requirements.
371347

372-
First, if you are upgrading stepwise from etcd v2 to etcd v3.6, you need to take care that the database is initialized with v3 data. See the [v2 data upgrade issue](https://github.com/etcd-io/etcd/issues/9480) for more details.
348+
First, if you are upgrading stepwise from etcd v2 to etcd v3.6, you need to take care that the database is initialized with v3 data. See the [v2 data upgrade issue](https://github.com/etcd-io/etcd/issues/9480) and [etcd v2 to v3 migration guide](https://etcd.io/docs/v3.6/tutorials/how-to-migrate/) for more details.
373349

374350
If the cluster is serving a v2 data set larger than 50MB, each newly upgraded member may take up to two minutes to catch up with the existing cluster. Check the size of a recent snapshot to estimate the total data size. In other words, it is safest to wait for 2 minutes between upgrading each member.
375351

@@ -512,7 +488,7 @@ Restart the etcd server with same configuration but with the new etcd binary.
512488
```diff
513489
-etcd-old --name ${name} \
514490
+etcd-new --name ${name} \
515-
--data-dir /tmp/etcd/s1 \
491+
--data-dir /path/to/${name}.etcd \
516492
--listen-client-urls http://localhost:2379 \
517493
--advertise-client-urls http://localhost:2379 \
518494
--listen-peer-urls http://localhost:2380 \

0 commit comments

Comments
 (0)