Skip to content

Commit

Permalink
set all graceful shutdown timeouts in integrations tests to 1s (#616)
Browse files Browse the repository at this point in the history
  • Loading branch information
@labrenbe
labrenbe authored Aug 14, 2024
1 parent 18953df commit 8966522
Show file tree
Hide file tree
Showing 12 changed files with 65 additions and 5 deletions.
5 changes: 5 additions & 0 deletions tests/templates/kuttl/authorizer/04-install-druid.yaml.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ spec:
zookeeperConfigMapName: druid-znode
brokers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
configOverrides:
Expand Down Expand Up @@ -68,6 +69,7 @@ spec:
replicas: 1
coordinators:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
configOverrides:
Expand All @@ -77,6 +79,7 @@ spec:
replicas: 1
historicals:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
configOverrides:
Expand All @@ -86,6 +89,7 @@ spec:
replicas: 1
middleManagers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
configOverrides:
Expand All @@ -95,6 +99,7 @@ spec:
replicas: 1
routers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
configOverrides:
Expand Down
5 changes: 5 additions & 0 deletions tests/templates/kuttl/cluster-operation/30-install-druid.yaml.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,34 +32,39 @@ spec:
zookeeperConfigMapName: druid-znode
brokers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 1
coordinators:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 1
historicals:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 1
middleManagers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 1
routers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
Expand Down
5 changes: 5 additions & 0 deletions tests/templates/kuttl/hdfs-deep-storage/03-install-druid.yaml.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,31 @@ spec:
zookeeperConfigMapName: druid-znode
brokers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 1
coordinators:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 1
historicals:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 1
middleManagers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
resources:
cpu:
min: 400m
Expand All @@ -68,6 +72,7 @@ spec:
replicas: 1
routers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
Expand Down
5 changes: 5 additions & 0 deletions tests/templates/kuttl/ingestion-no-s3-ext/03-install-druid.yaml.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,34 +34,39 @@ spec:
zookeeperConfigMapName: druid-znode
brokers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 1
coordinators:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 1
historicals:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 1
middleManagers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 1
routers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
Expand Down
5 changes: 5 additions & 0 deletions tests/templates/kuttl/ingestion-s3-ext/03-install-druid.yaml.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,34 +40,39 @@ spec:
zookeeperConfigMapName: druid-znode
brokers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 1
coordinators:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 1
historicals:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 1
middleManagers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 1
routers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
Expand Down
10 changes: 10 additions & 0 deletions tests/templates/kuttl/logging/05-install-druid.yaml.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ spec:
vectorAggregatorConfigMapName: druid-vector-aggregator-discovery
zookeeperConfigMapName: druid-znode
brokers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
roleGroups:
automatic-log-config:
replicas: 1
Expand Down Expand Up @@ -100,6 +102,8 @@ spec:
custom:
configMap: druid-log-config
coordinators:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
roleGroups:
automatic-log-config:
replicas: 1
Expand Down Expand Up @@ -141,6 +145,8 @@ spec:
custom:
configMap: druid-log-config
historicals:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
roleGroups:
automatic-log-config:
replicas: 1
Expand Down Expand Up @@ -182,6 +188,8 @@ spec:
custom:
configMap: druid-log-config
middleManagers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
roleGroups:
automatic-log-config:
replicas: 1
Expand Down Expand Up @@ -223,6 +231,8 @@ spec:
custom:
configMap: druid-log-config
routers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
roleGroups:
automatic-log-config:
replicas: 1
Expand Down
5 changes: 5 additions & 0 deletions tests/templates/kuttl/orphaned-resources/03-install-druid.yaml.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,34 +34,39 @@ spec:
zookeeperConfigMapName: druid-znode
brokers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 1
coordinators:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 1
historicals:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 1
middleManagers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 1
routers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
Expand Down
5 changes: 5 additions & 0 deletions tests/templates/kuttl/resources/30-install-druid.yaml.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ spec:
zookeeperConfigMapName: druid-znode
brokers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
resources:
Expand All @@ -51,6 +52,7 @@ spec:
replicas: 1
coordinators:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
resources:
Expand All @@ -64,6 +66,7 @@ spec:
replicas: 1
historicals:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
resources:
Expand All @@ -79,6 +82,7 @@ spec:
replicas: 1
middleManagers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
resources:
Expand All @@ -92,6 +96,7 @@ spec:
replicas: 1
routers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
resources:
Expand Down
5 changes: 5 additions & 0 deletions tests/templates/kuttl/s3-deep-storage/10-install-druid.yaml.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,34 +70,39 @@ spec:
zookeeperConfigMapName: druid-znode
brokers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 1
coordinators:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 1
historicals:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 1
middleManagers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
default:
replicas: 1
routers:
config:
gracefulShutdownTimeout: 1s # Let the test run faster
logging:
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
roleGroups:
Expand Down
Loading

0 comments on commit 8966522

Please sign in to comment.