Skip to content

Commit 67f3f1b

Browse files
committed
configure gracefulShutdownTimeout in (almost) all tests
1 parent f059e7f commit 67f3f1b

38 files changed

+95
-5
lines changed

tests/templates/kuttl/cluster-operation/01-install-zookeeper.yaml.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ spec:
1313
{% endif %}
1414
servers:
1515
config:
16+
gracefulShutdownTimeout: 1m
1617
logging:
1718
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
1819
roleGroups:

tests/templates/kuttl/cluster-operation/02-install-hdfs.yaml.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,23 @@ spec:
1414
{% endif %}
1515
nameNodes:
1616
config:
17+
gracefulShutdownTimeout: 1m
1718
logging:
1819
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
1920
roleGroups:
2021
default:
2122
replicas: 2
2223
dataNodes:
2324
config:
25+
gracefulShutdownTimeout: 1m
2426
logging:
2527
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
2628
roleGroups:
2729
default:
2830
replicas: 1
2931
journalNodes:
3032
config:
33+
gracefulShutdownTimeout: 1m
3134
logging:
3235
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
3336
roleGroups:

tests/templates/kuttl/cluster-operation/03-install-hbase.yaml.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,23 @@ spec:
2626
{% endif %}
2727
masters:
2828
config:
29+
gracefulShutdownTimeout: 1m
2930
logging:
3031
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
3132
roleGroups:
3233
default:
3334
replicas: 1
3435
regionServers:
3536
config:
37+
gracefulShutdownTimeout: 1m
3638
logging:
3739
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
3840
roleGroups:
3941
default:
4042
replicas: 1
4143
restServers:
4244
config:
45+
gracefulShutdownTimeout: 1m
4346
logging:
4447
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
4548
roleGroups:

tests/templates/kuttl/cluster-operation/10-pause-hbase.yaml.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,23 @@ spec:
2929
reconciliationPaused: true
3030
masters:
3131
config:
32+
gracefulShutdownTimeout: 1m
3233
logging:
3334
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
3435
roleGroups:
3536
default:
3637
replicas: 1
3738
regionServers:
3839
config:
40+
gracefulShutdownTimeout: 1m
3941
logging:
4042
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
4143
roleGroups:
4244
default:
4345
replicas: 1
4446
restServers:
4547
config:
48+
gracefulShutdownTimeout: 1m
4649
logging:
4750
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
4851
roleGroups:

tests/templates/kuttl/cluster-operation/20-stop-hbase.yaml.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,23 @@ spec:
2929
reconciliationPaused: false
3030
masters:
3131
config:
32+
gracefulShutdownTimeout: 1m
3233
logging:
3334
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
3435
roleGroups:
3536
default:
3637
replicas: 1
3738
regionServers:
3839
config:
40+
gracefulShutdownTimeout: 1m
3941
logging:
4042
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
4143
roleGroups:
4244
default:
4345
replicas: 1
4446
restServers:
4547
config:
48+
gracefulShutdownTimeout: 1m
4649
logging:
4750
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
4851
roleGroups:

tests/templates/kuttl/cluster-operation/30-restart-hbase.yaml.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,23 @@ spec:
2929
reconciliationPaused: false
3030
masters:
3131
config:
32+
gracefulShutdownTimeout: 1m
3233
logging:
3334
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
3435
roleGroups:
3536
default:
3637
replicas: 1
3738
regionServers:
3839
config:
40+
gracefulShutdownTimeout: 1m
3941
logging:
4042
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
4143
roleGroups:
4244
default:
4345
replicas: 1
4446
restServers:
4547
config:
48+
gracefulShutdownTimeout: 1m
4649
logging:
4750
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
4851
roleGroups:

tests/templates/kuttl/kerberos/10-install-zk.yaml.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ spec:
1414
{% endif %}
1515
servers:
1616
config:
17+
gracefulShutdownTimeout: 1m
1718
logging:
1819
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
1920
roleGroups:

tests/templates/kuttl/kerberos/11-install-hdfs.yaml.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ commands:
3232
{% endif %}
3333
nameNodes:
3434
config:
35+
gracefulShutdownTimeout: 1m
3536
listenerClass: {{ test_scenario['values']['listener-class'] }}
3637
logging:
3738
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
@@ -44,6 +45,7 @@ commands:
4445
replicas: 2
4546
dataNodes:
4647
config:
48+
gracefulShutdownTimeout: 1m
4749
listenerClass: {{ test_scenario['values']['listener-class'] }}
4850
logging:
4951
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
@@ -53,6 +55,7 @@ commands:
5355
replicas: 2
5456
journalNodes:
5557
config:
58+
gracefulShutdownTimeout: 1m
5659
logging:
5760
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
5861
configOverrides: *configOverrides

tests/templates/kuttl/kerberos/30-install-hbase.yaml.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,23 @@ commands:
3838
{% endif %}
3939
masters:
4040
config:
41+
gracefulShutdownTimeout: 1m
4142
logging:
4243
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
4344
roleGroups:
4445
default:
4546
replicas: 2
4647
regionServers:
4748
config:
49+
gracefulShutdownTimeout: 1m
4850
logging:
4951
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
5052
roleGroups:
5153
default:
5254
replicas: 2
5355
restServers:
5456
config:
57+
gracefulShutdownTimeout: 1m
5558
logging:
5659
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
5760
roleGroups:

tests/templates/kuttl/logging/02-install-zookeeper.yaml.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ spec:
1313
{% endif %}
1414
servers:
1515
config:
16+
gracefulShutdownTimeout: 1m
1617
logging:
1718
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
1819
roleGroups:

0 commit comments

Comments
 (0)