Skip to content

Commit 9924a8e

Browse files
msmygitmsmygit
authored
Merge pull request #159 from datastax/issue/CDM-67
CDM-67 adding target read rate limiter
2 parents ed7ba7c + 316845b commit 9924a8e

File tree

38 files changed

+220
-218
lines changed

38 files changed

+220
-218
lines changed

‎PERF/cdm-v4.properties

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
# Connections are made with the Spark Cassandra Connector; conventions there likely work here
2121
# See https://github.com/datastax/spark-cassandra-connector/blob/master/doc/reference.md
2222
#
23-
# spark.cdm.origin.connect
24-
# spark.cdm.target.connect
23+
# spark.cdm.connect.origin
24+
# spark.cdm.connect.target
2525
# .host : Default is localhost. Hostname/IP address of the cluster; may be a comma-separated list,
2626
# and can follow the <hostname>:<port> convention.
2727
# .port : Default is 9042. Port number to use if not specified on .host
@@ -31,17 +31,17 @@
3131
#
3232
# You must set either .host or .scb.
3333
#-----------------------------------------------------------------------------------------------------------
34-
spark.cdm.origin.connect.host cass-origin
35-
spark.cdm.origin.connect.port 9042
36-
#spark.cdm.origin.connect.scb file:///aaa/bbb/secure-connect-enterprise.zip
37-
spark.cdm.origin.connect.username cassandra
38-
spark.cdm.origin.connect.password cassandra
34+
spark.cdm.connect.origin.host cass-origin
35+
spark.cdm.connect.origin.port 9042
36+
#spark.cdm.connect.origin.scb file:///aaa/bbb/secure-connect-enterprise.zip
37+
spark.cdm.connect.origin.username cassandra
38+
spark.cdm.connect.origin.password cassandra
3939

40-
spark.cdm.target.connect.host cass-target
41-
spark.cdm.target.connect.port 9042
42-
#spark.cdm.target.connect.scb file:///aaa/bbb/secure-connect-enterprise.zip
43-
spark.cdm.target.connect.username cassandra
44-
spark.cdm.target.connect.password cassandra
40+
spark.cdm.connect.target.host cass-target
41+
spark.cdm.connect.target.port 9042
42+
#spark.cdm.connect.target.scb file:///aaa/bbb/secure-connect-enterprise.zip
43+
spark.cdm.connect.target.username cassandra
44+
spark.cdm.connect.target.password cassandra
4545

4646
#===========================================================================================================
4747
# Details about the Origin Schema
@@ -323,8 +323,8 @@ spark.cdm.perfops.writeRateLimit 5000
323323
# TLS (SSL) connection parameters, if so configured. Note that Secure Bundles embed these details.
324324
# See https://github.com/datastax/spark-cassandra-connector/blob/master/doc/reference.md
325325
#
326-
# spark.cdm.origin.connect.tls
327-
# spark.cdm.target.connect.tls
326+
# spark.cdm.connect.origin.tls
327+
# spark.cdm.connect.target.tls
328328
# .enabled : Default is false. Set to true if TLS is used.
329329
# .trustStore
330330
# .path : Filepath to the Java truststore file
@@ -335,20 +335,20 @@ spark.cdm.perfops.writeRateLimit 5000
335335
# .password : Password needed to open the keystore
336336
# .enabledAlgorithms : Default is TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA
337337
#-----------------------------------------------------------------------------------------------------------
338-
#spark.cdm.origin.connect.tls.enabled false
339-
#spark.cdm.origin.connect.tls.trustStore.path
340-
#spark.cdm.origin.connect.tls.trustStore.password
341-
#spark.cdm.origin.connect.tls.trustStore.type JKS
342-
#spark.cdm.origin.connect.tls.keyStore.path
343-
#spark.cdm.origin.connect.tls.keyStore.password
344-
#spark.cdm.origin.connect.tls.enabledAlgorithms TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA
338+
#spark.cdm.connect.origin.tls.enabled false
339+
#spark.cdm.connect.origin.tls.trustStore.path
340+
#spark.cdm.connect.origin.tls.trustStore.password
341+
#spark.cdm.connect.origin.tls.trustStore.type JKS
342+
#spark.cdm.connect.origin.tls.keyStore.path
343+
#spark.cdm.connect.origin.tls.keyStore.password
344+
#spark.cdm.connect.origin.tls.enabledAlgorithms TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA
345345

346-
#spark.cdm.target.connect.tls.enabled false
347-
#spark.cdm.target.connect.tls.trustStore.path
348-
#spark.cdm.target.connect.tls.trustStore.password
349-
#spark.cdm.target.connect.tls.trustStore.type JKS
350-
#spark.cdm.target.connect.tls.keyStore.path
351-
#spark.cdm.target.connect.tls.keyStore.password
352-
#spark.cdm.target.connect.tls.enabledAlgorithms TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA
346+
#spark.cdm.connect.target.tls.enabled false
347+
#spark.cdm.connect.target.tls.trustStore.path
348+
#spark.cdm.connect.target.tls.trustStore.password
349+
#spark.cdm.connect.target.tls.trustStore.type JKS
350+
#spark.cdm.connect.target.tls.keyStore.path
351+
#spark.cdm.connect.target.tls.keyStore.password
352+
#spark.cdm.connect.target.tls.enabledAlgorithms TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA
353353

354354

‎SIT/features/01_constant_column/fix.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
spark.cdm.origin.connect.host cdm-sit-cass
2-
spark.cdm.target.connect.host cdm-sit-cass
1+
spark.cdm.connect.origin.host cdm-sit-cass
2+
spark.cdm.connect.target.host cdm-sit-cass
33

44
spark.cdm.schema.origin.keyspaceTable origin.feature_constant_column
55
spark.cdm.schema.target.keyspaceTable target.feature_constant_column

‎SIT/features/01_constant_column/migrate.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
spark.cdm.origin.connect.host cdm-sit-cass
2-
spark.cdm.target.connect.host cdm-sit-cass
1+
spark.cdm.connect.origin.host cdm-sit-cass
2+
spark.cdm.connect.target.host cdm-sit-cass
33

44
spark.cdm.schema.origin.keyspaceTable origin.feature_constant_column
55
spark.cdm.schema.target.keyspaceTable target.feature_constant_column

‎SIT/features/02_explode_map/fix.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
spark.cdm.origin.connect.host cdm-sit-cass
2-
spark.cdm.target.connect.host cdm-sit-cass
1+
spark.cdm.connect.origin.host cdm-sit-cass
2+
spark.cdm.connect.target.host cdm-sit-cass
33

44
spark.cdm.schema.origin.keyspaceTable origin.feature_explode_map
55
spark.cdm.schema.target.keyspaceTable target.feature_explode_map

‎SIT/features/02_explode_map/migrate.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
spark.cdm.origin.connect.host cdm-sit-cass
2-
spark.cdm.target.connect.host cdm-sit-cass
1+
spark.cdm.connect.origin.host cdm-sit-cass
2+
spark.cdm.connect.target.host cdm-sit-cass
33

44
spark.cdm.schema.origin.keyspaceTable origin.feature_explode_map
55
spark.cdm.schema.target.keyspaceTable target.feature_explode_map

‎SIT/features/03_codec/fix.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
spark.cdm.origin.connect.host cdm-sit-cass
2-
spark.cdm.target.connect.host cdm-sit-cass
1+
spark.cdm.connect.origin.host cdm-sit-cass
2+
spark.cdm.connect.target.host cdm-sit-cass
33

44
spark.cdm.schema.origin.keyspaceTable origin.codec
55
spark.cdm.schema.target.keyspaceTable target.codec

‎SIT/features/03_codec/migrate.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
spark.cdm.origin.connect.host cdm-sit-cass
2-
spark.cdm.target.connect.host cdm-sit-cass
1+
spark.cdm.connect.origin.host cdm-sit-cass
2+
spark.cdm.connect.target.host cdm-sit-cass
33

44
spark.cdm.schema.origin.keyspaceTable origin.codec
55
spark.cdm.schema.target.keyspaceTable target.codec

‎SIT/features/04_udt_mapper/fix.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
spark.cdm.origin.connect.host cdm-sit-cass
2-
spark.cdm.target.connect.host cdm-sit-cass
1+
spark.cdm.connect.origin.host cdm-sit-cass
2+
spark.cdm.connect.target.host cdm-sit-cass
33

44
spark.cdm.schema.origin.keyspaceTable origin.udt_mapper
55
spark.cdm.schema.target.keyspaceTable target.udt_mapper

‎SIT/features/04_udt_mapper/migrate.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
spark.cdm.origin.connect.host cdm-sit-cass
2-
spark.cdm.target.connect.host cdm-sit-cass
1+
spark.cdm.connect.origin.host cdm-sit-cass
2+
spark.cdm.connect.target.host cdm-sit-cass
33

44
spark.cdm.schema.origin.keyspaceTable origin.udt_mapper
55
spark.cdm.schema.target.keyspaceTable target.udt_mapper

‎SIT/features/05_guardrail/fix.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
spark.cdm.origin.connect.host cdm-sit-cass
2-
spark.cdm.target.connect.host cdm-sit-cass
1+
spark.cdm.connect.origin.host cdm-sit-cass
2+
spark.cdm.connect.target.host cdm-sit-cass
33

44
spark.cdm.schema.origin.keyspaceTable origin.feature_guardrail
55
spark.cdm.schema.target.keyspaceTable target.feature_guardrail

0 commit comments

Comments
 (0)