Commit 91d0fd8
committed
QA: Preserve templates and snapshot on upgrades
Monitoring wasn't consistently creating its templates when the rolling
upgrade test case was running against the zip distribution. It looked
like the templates were being removed as soon as they were created:
```
[2018-05-29T15:33:38,311][DEBUG][o.e.c.s.ClusterApplierService] [node-0] processing [apply cluster state (from master [master {node-0}{9cTSjfGtQyeoSNxIRF_BdQ}{SI9wsZjeQUKAAhBavEnOPQ}{127.0.0.1}{127.0.0.1:45985}{ml.machine_memory=33651564544, xpack.installed=true, testattr=test, ml.max_open_jobs=20, ml.enabled=true} committed version [160] source [create-index-template [.monitoring-kibana], cause [api]]])]: took [11ms] done applying updated cluster state (version: 160, uuid: z0cPB7DkQceXohOOzYgRRg)
[2018-05-29T15:33:40,752][INFO ][o.e.c.m.MetaDataIndexTemplateService] [node-0] removing template [.monitoring-es]
[2018-05-29T15:33:40,752][INFO ][o.e.c.m.MetaDataIndexTemplateService] [node-0] removing template [.monitoring-alerts]
[2018-05-29T15:33:40,752][INFO ][o.e.c.m.MetaDataIndexTemplateService] [node-0] removing template [.monitoring-kibana]
[2018-05-29T15:33:40,752][INFO ][o.e.c.m.MetaDataIndexTemplateService] [node-0] removing template [.monitoring-logstash]
[2018-05-29T15:33:40,752][INFO ][o.e.c.m.MetaDataIndexTemplateService] [node-0] removing template [.monitoring-beats]
```
It turns out that this was my fault. I had configured the tests to
delete the templates. This change configures the tests to keep the
templates and any snapshots we make for good measure. This causes the
`.monitoring-*` templates to be in the cluster state when we look for
them.
Closes #309251 parent 595c130 commit 91d0fd8
File tree
3 files changed
+27
-2
lines changed- qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades
3 files changed
+27
-2
lines changedLines changed: 10 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
56 | 66 | | |
57 | 67 | | |
58 | 68 | | |
| |||
Lines changed: 12 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
| 34 | + | |
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | | - | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
40 | 50 | | |
41 | 51 | | |
42 | 52 | | |
| |||
Lines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
87 | 87 | | |
88 | 88 | | |
89 | 89 | | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
90 | 95 | | |
91 | 96 | | |
92 | 97 | | |
| |||
0 commit comments