Skip to content

Commit 4ab2fc2

Browse files
maltesandermaltesander
committed
fix: adapt unit tests to new metadatabase crd
1 parent 41ffc8f commit 4ab2fc2

10 files changed

Lines changed: 54 additions & 194 deletions

File tree

‎rust/operator-binary/src/config/jvm.rs‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,11 @@ mod tests {
100100
hdfs:
101101
configMapName: simple-hdfs
102102
directory: /druid
103-
metadataStorageDatabase:
104-
dbType: postgresql
105-
connString: jdbc:postgresql://druid-postgresql/druid
106-
host: druid-postgresql
107-
port: 5432
108-
credentialsSecret: mySecret
103+
metadataDatabase:
104+
postgresql:
105+
host: druid-postgresql
106+
database: druid
107+
credentialsSecretName: mySecret
109108
zookeeperConfigMapName: simple-druid-znode
110109
brokers:
111110
roleGroups:
@@ -187,12 +186,11 @@ mod tests {
187186
hdfs:
188187
configMapName: simple-hdfs
189188
directory: /druid
190-
metadataStorageDatabase:
191-
dbType: postgresql
192-
connString: jdbc:postgresql://druid-postgresql/druid
193-
host: druid-postgresql
194-
port: 5432
195-
credentialsSecret: mySecret
189+
metadataDatabase:
190+
postgresql:
191+
host: druid-postgresql
192+
database: druid
193+
credentialsSecretName: mySecret
196194
zookeeperConfigMapName: simple-druid-znode
197195
brokers:
198196
roleGroups:

‎rust/operator-binary/src/crd/affinity.rs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,11 @@ mod tests {
112112
hdfs:
113113
configMapName: simple-hdfs
114114
directory: /druid
115-
metadataStorageDatabase:
116-
dbType: postgresql
117-
connString: jdbc:postgresql://druid-postgresql/druid
118-
host: druid-postgresql
119-
port: 5432
120-
credentialsSecret: mySecret
115+
metadataDatabase:
116+
postgresql:
117+
host: druid-postgresql
118+
database: druid
119+
credentialsSecretName: mySecret
121120
zookeeperConfigMapName: simple-druid-znode
122121
brokers:
123122
roleGroups:

‎rust/operator-binary/src/crd/authentication.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -258,11 +258,9 @@ deepStorage:
258258
hdfs:
259259
configMapName: druid-hdfs
260260
directory: /druid
261-
metadataStorageDatabase:
262-
dbType: derby
263-
connString: jdbc:derby://localhost:1527/var/druid/metadata.db;create=true
264-
host: localhost
265-
port: 1527
261+
metadataDatabase:
262+
derby:
263+
location: localhost:1527/var/druid/metadata.db;create=true
266264
zookeeperConfigMapName: zk-config-map
267265
"#;
268266

‎rust/operator-binary/src/crd/tls.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,9 @@ deepStorage:
4040
hdfs:
4141
configMapName: druid-hdfs
4242
directory: /druid
43-
metadataStorageDatabase:
44-
dbType: derby
45-
connString: jdbc:derby://localhost:1527/var/druid/metadata.db;create=true
46-
host: localhost
47-
port: 1527
43+
metadataDatabase:
44+
derby:
45+
location: localhost:1527/var/druid/metadata.db;create=true
4846
zookeeperConfigMapName: zk-config-map
4947
"#;
5048

‎rust/operator-binary/test/resources/crd/resource_merge/druid_cluster.yaml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ spec:
1313
hdfs:
1414
configMapName: simple-hdfs
1515
directory: /druid
16-
metadataStorageDatabase:
17-
dbType: postgresql
18-
connString: jdbc:postgresql://druid-postgresql/druid
19-
host: druid-postgresql
20-
port: 5432
21-
credentialsSecret: mySecret
16+
metadataDatabase:
17+
postgresql:
18+
host: druid-postgresql
19+
database: druid
20+
credentialsSecretName: mySecret
2221
zookeeperConfigMapName: psql-druid-znode
2322
brokers:
2423
roleGroups:

‎rust/operator-binary/test/resources/crd/resource_merge/segment_cache.yaml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ spec:
1313
hdfs:
1414
configMapName: simple-hdfs
1515
directory: /druid
16-
metadataStorageDatabase:
17-
dbType: postgresql
18-
connString: jdbc:postgresql://druid-postgresql/druid
19-
host: druid-postgresql
20-
port: 5432
21-
credentialsSecret: mySecret
16+
metadataDatabase:
17+
postgresql:
18+
host: druid-postgresql
19+
database: druid
20+
credentialsSecretName: mySecret
2221
zookeeperConfigMapName: psql-druid-znode
2322
brokers:
2423
roleGroups:

‎rust/operator-binary/test/resources/crd/role_service/druid_cluster.yaml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ spec:
1313
hdfs:
1414
configMapName: simple-hdfs
1515
directory: /druid
16-
metadataStorageDatabase:
17-
dbType: postgresql
18-
connString: jdbc:postgresql://druid-postgresql/druid
19-
host: druid-postgresql
20-
port: 5432
21-
credentialsSecret: mySecret
16+
metadataDatabase:
17+
postgresql:
18+
host: druid-postgresql
19+
database: druid
20+
credentialsSecretName: mySecret
2221
zookeeperConfigMapName: psql-druid-znode
2322
brokers:
2423
roleGroups:

‎rust/operator-binary/test/resources/druid_controller/properties.yaml‎

Lines changed: 8 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ spec:
99
- "/tmp/xyz"
1010
- unit: &unitPort
1111
name: "port"
12-
regex: "^([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$"
12+
regex: "^([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]\
13+
|6553[0-5])$"
1314
- unit: &unitPrometheusNamespace
1415
name: "prometheusNamespace"
1516
regex: "^[a-zA-Z_:][a-zA-Z0-9_:]*$"
1617
- unit: &unitDuration
1718
name: "duration"
18-
regex: "^P(?!$)(\\d+Y)?(\\d+M)?(\\d+W)?(\\d+D)?(T(?=\\d)(\\d+H)?(\\d+M)?(\\d+S)?)?$"
19+
regex: "^P(?!$)(\\d+Y)?(\\d+M)?(\\d+W)?(\\d+D)?(T(?=\\d)(\\d+H)?(\\d+M)?(\\d+S)\
20+
?)?$"
1921
examples:
2022
- "PT300S"
2123

@@ -229,139 +231,6 @@ properties:
229231
required: true
230232
asOfVersion: "0.0.0"
231233

232-
- property: &metadataStorageType
233-
propertyNames:
234-
- name: "druid.metadata.storage.type"
235-
kind:
236-
type: "file"
237-
file: "runtime.properties"
238-
datatype:
239-
type: "string"
240-
allowedValues:
241-
- "mysql"
242-
- "postgresql"
243-
- "derby"
244-
roles:
245-
- name: "broker"
246-
required: true
247-
- name: "coordinator"
248-
required: true
249-
- name: "historical"
250-
required: true
251-
- name: "middlemanager"
252-
required: true
253-
- name: "router"
254-
required: true
255-
asOfVersion: "0.0.0"
256-
257-
- property: &metadataStorageConnectURI
258-
propertyNames:
259-
- name: "druid.metadata.storage.connector.connectURI"
260-
kind:
261-
type: "file"
262-
file: "runtime.properties"
263-
datatype:
264-
type: "string"
265-
roles:
266-
- name: "broker"
267-
required: true
268-
- name: "coordinator"
269-
required: true
270-
- name: "historical"
271-
required: true
272-
- name: "middlemanager"
273-
required: true
274-
- name: "router"
275-
required: true
276-
asOfVersion: "0.0.0"
277-
278-
- property: &metadataStorageHost
279-
propertyNames:
280-
- name: "druid.metadata.storage.connector.host"
281-
kind:
282-
type: "file"
283-
file: "runtime.properties"
284-
datatype:
285-
type: "string"
286-
roles:
287-
- name: "broker"
288-
required: true
289-
- name: "coordinator"
290-
required: true
291-
- name: "historical"
292-
required: true
293-
- name: "middlemanager"
294-
required: true
295-
- name: "router"
296-
required: true
297-
asOfVersion: "0.0.0"
298-
299-
- property: &metadataStoragePort
300-
propertyNames:
301-
- name: "druid.metadata.storage.connector.port"
302-
kind:
303-
type: "file"
304-
file: "runtime.properties"
305-
datatype:
306-
type: "integer"
307-
min: "1024"
308-
max: "65535"
309-
unit: *unitPort
310-
roles:
311-
- name: "broker"
312-
required: true
313-
- name: "coordinator"
314-
required: true
315-
- name: "historical"
316-
required: true
317-
- name: "middlemanager"
318-
required: true
319-
- name: "router"
320-
required: true
321-
asOfVersion: "0.0.0"
322-
323-
- property: &metadataStorageUser
324-
propertyNames:
325-
- name: "druid.metadata.storage.connector.user"
326-
kind:
327-
type: "file"
328-
file: "runtime.properties"
329-
datatype:
330-
type: "string"
331-
roles:
332-
- name: "broker"
333-
required: false
334-
- name: "coordinator"
335-
required: false
336-
- name: "historical"
337-
required: false
338-
- name: "middlemanager"
339-
required: false
340-
- name: "router"
341-
required: false
342-
asOfVersion: "0.0.0"
343-
344-
- property: &metadataStoragePassword
345-
propertyNames:
346-
- name: "druid.metadata.storage.connector.password"
347-
kind:
348-
type: "file"
349-
file: "runtime.properties"
350-
datatype:
351-
type: "string"
352-
roles:
353-
- name: "broker"
354-
required: false
355-
- name: "coordinator"
356-
required: false
357-
- name: "historical"
358-
required: false
359-
- name: "middlemanager"
360-
required: false
361-
- name: "router"
362-
required: false
363-
asOfVersion: "0.0.0"
364-
365234
- property: &indexerLogsDirectory
366235
propertyNames:
367236
- name: "druid.indexer.logs.directory"
@@ -472,7 +341,10 @@ properties:
472341
type: "string"
473342
defaultValues:
474343
- fromVersion: "0.0.0"
475-
value: "-server -Xms256m -Xmx256m -XX:MaxDirectMemorySize=300m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -XX:+ExitOnOutOfMemoryError -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager"
344+
value: "-server -Xms256m -Xmx256m -XX:MaxDirectMemorySize=300m
345+
-Duser.timezone=UTC -Dfile.encoding=UTF-8
346+
-XX:+ExitOnOutOfMemoryError
347+
-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager"
476348
roles:
477349
- name: "broker"
478350
required: false

‎rust/operator-binary/test/resources/druid_controller/segment_cache.yaml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ spec:
2121
accessStyle: Path
2222
credentials:
2323
secretClass: druid-s3-credentials
24-
metadataStorageDatabase:
25-
dbType: postgresql
26-
connString: jdbc:postgresql://druid-postgresql/druid
27-
host: druid-postgresql
28-
port: 5432
29-
credentialsSecret: mySecret
24+
metadataDatabase:
25+
postgresql:
26+
host: druid-postgresql
27+
database: druid
28+
credentialsSecretName: mySecret
3029
zookeeperConfigMapName: psql-druid-znode
3130
brokers:
3231
roleGroups:

‎rust/operator-binary/test/resources/druid_controller/simple.yaml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ spec:
1313
hdfs:
1414
configMapName: simple-hdfs
1515
directory: /druid
16-
metadataStorageDatabase:
17-
dbType: postgresql
18-
connString: jdbc:postgresql://druid-postgresql/druid
19-
host: druid-postgresql
20-
port: 5432
21-
credentialsSecret: mySecret
16+
metadataDatabase:
17+
postgresql:
18+
host: druid-postgresql
19+
database: druid
20+
credentialsSecretName: mySecret
2221
zookeeperConfigMapName: psql-druid-znode
2322
additionalExtensions:
2423
- druid-avro-extensions

0 commit comments

Comments
 (0)