Skip to content

Commit 9dd013c

Browse files
authored
Updated the docs (#2373)
1 parent 709c0ab commit 9dd013c

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

v2/datastream-to-spanner/README_Cloud_Datastream_to_Spanner.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ on [Metadata Annotations](https://github.com/GoogleCloudPlatform/DataflowTemplat
7979
* **schemaOverridesFilePath**: A file which specifies the table and the column name overrides from source to spanner. Defaults to empty.
8080
* **shadowTableSpannerDatabaseId**: Optional separate database for shadow tables. If not specified, shadow tables will be created in the main database. If specified, ensure shadowTableSpannerInstanceId is specified as well. Defaults to empty.
8181
* **shadowTableSpannerInstanceId**: Optional separate instance for shadow tables. If not specified, shadow tables will be created in the main instance. If specified, ensure shadowTableSpannerDatabaseId is specified as well. Defaults to empty.
82+
* **failureInjectionParameter**: Failure injection parameter. Only used for testing. Defaults to empty.
8283

8384

8485

@@ -193,6 +194,7 @@ export COLUMN_OVERRIDES=""
193194
export SCHEMA_OVERRIDES_FILE_PATH=""
194195
export SHADOW_TABLE_SPANNER_DATABASE_ID=""
195196
export SHADOW_TABLE_SPANNER_INSTANCE_ID=""
197+
export FAILURE_INJECTION_PARAMETER=""
196198

197199
gcloud dataflow flex-template run "cloud-datastream-to-spanner-job" \
198200
--project "$PROJECT" \
@@ -231,7 +233,8 @@ gcloud dataflow flex-template run "cloud-datastream-to-spanner-job" \
231233
--parameters "columnOverrides=$COLUMN_OVERRIDES" \
232234
--parameters "schemaOverridesFilePath=$SCHEMA_OVERRIDES_FILE_PATH" \
233235
--parameters "shadowTableSpannerDatabaseId=$SHADOW_TABLE_SPANNER_DATABASE_ID" \
234-
--parameters "shadowTableSpannerInstanceId=$SHADOW_TABLE_SPANNER_INSTANCE_ID"
236+
--parameters "shadowTableSpannerInstanceId=$SHADOW_TABLE_SPANNER_INSTANCE_ID" \
237+
--parameters "failureInjectionParameter=$FAILURE_INJECTION_PARAMETER"
235238
```
236239

237240
For more information about the command, please check:
@@ -286,6 +289,7 @@ export COLUMN_OVERRIDES=""
286289
export SCHEMA_OVERRIDES_FILE_PATH=""
287290
export SHADOW_TABLE_SPANNER_DATABASE_ID=""
288291
export SHADOW_TABLE_SPANNER_INSTANCE_ID=""
292+
export FAILURE_INJECTION_PARAMETER=""
289293

290294
mvn clean package -PtemplatesRun \
291295
-DskipTests \
@@ -294,7 +298,7 @@ mvn clean package -PtemplatesRun \
294298
-Dregion="$REGION" \
295299
-DjobName="cloud-datastream-to-spanner-job" \
296300
-DtemplateName="Cloud_Datastream_to_Spanner" \
297-
-Dparameters="inputFilePattern=$INPUT_FILE_PATTERN,inputFileFormat=$INPUT_FILE_FORMAT,sessionFilePath=$SESSION_FILE_PATH,instanceId=$INSTANCE_ID,databaseId=$DATABASE_ID,projectId=$PROJECT_ID,spannerHost=$SPANNER_HOST,gcsPubSubSubscription=$GCS_PUB_SUB_SUBSCRIPTION,streamName=$STREAM_NAME,shadowTablePrefix=$SHADOW_TABLE_PREFIX,shouldCreateShadowTables=$SHOULD_CREATE_SHADOW_TABLES,rfcStartDateTime=$RFC_START_DATE_TIME,fileReadConcurrency=$FILE_READ_CONCURRENCY,deadLetterQueueDirectory=$DEAD_LETTER_QUEUE_DIRECTORY,dlqRetryMinutes=$DLQ_RETRY_MINUTES,dlqMaxRetryCount=$DLQ_MAX_RETRY_COUNT,dataStreamRootUrl=$DATA_STREAM_ROOT_URL,datastreamSourceType=$DATASTREAM_SOURCE_TYPE,roundJsonDecimals=$ROUND_JSON_DECIMALS,runMode=$RUN_MODE,transformationContextFilePath=$TRANSFORMATION_CONTEXT_FILE_PATH,directoryWatchDurationInMinutes=$DIRECTORY_WATCH_DURATION_IN_MINUTES,spannerPriority=$SPANNER_PRIORITY,dlqGcsPubSubSubscription=$DLQ_GCS_PUB_SUB_SUBSCRIPTION,transformationJarPath=$TRANSFORMATION_JAR_PATH,transformationClassName=$TRANSFORMATION_CLASS_NAME,transformationCustomParameters=$TRANSFORMATION_CUSTOM_PARAMETERS,filteredEventsDirectory=$FILTERED_EVENTS_DIRECTORY,shardingContextFilePath=$SHARDING_CONTEXT_FILE_PATH,tableOverrides=$TABLE_OVERRIDES,columnOverrides=$COLUMN_OVERRIDES,schemaOverridesFilePath=$SCHEMA_OVERRIDES_FILE_PATH,shadowTableSpannerDatabaseId=$SHADOW_TABLE_SPANNER_DATABASE_ID,shadowTableSpannerInstanceId=$SHADOW_TABLE_SPANNER_INSTANCE_ID" \
301+
-Dparameters="inputFilePattern=$INPUT_FILE_PATTERN,inputFileFormat=$INPUT_FILE_FORMAT,sessionFilePath=$SESSION_FILE_PATH,instanceId=$INSTANCE_ID,databaseId=$DATABASE_ID,projectId=$PROJECT_ID,spannerHost=$SPANNER_HOST,gcsPubSubSubscription=$GCS_PUB_SUB_SUBSCRIPTION,streamName=$STREAM_NAME,shadowTablePrefix=$SHADOW_TABLE_PREFIX,shouldCreateShadowTables=$SHOULD_CREATE_SHADOW_TABLES,rfcStartDateTime=$RFC_START_DATE_TIME,fileReadConcurrency=$FILE_READ_CONCURRENCY,deadLetterQueueDirectory=$DEAD_LETTER_QUEUE_DIRECTORY,dlqRetryMinutes=$DLQ_RETRY_MINUTES,dlqMaxRetryCount=$DLQ_MAX_RETRY_COUNT,dataStreamRootUrl=$DATA_STREAM_ROOT_URL,datastreamSourceType=$DATASTREAM_SOURCE_TYPE,roundJsonDecimals=$ROUND_JSON_DECIMALS,runMode=$RUN_MODE,transformationContextFilePath=$TRANSFORMATION_CONTEXT_FILE_PATH,directoryWatchDurationInMinutes=$DIRECTORY_WATCH_DURATION_IN_MINUTES,spannerPriority=$SPANNER_PRIORITY,dlqGcsPubSubSubscription=$DLQ_GCS_PUB_SUB_SUBSCRIPTION,transformationJarPath=$TRANSFORMATION_JAR_PATH,transformationClassName=$TRANSFORMATION_CLASS_NAME,transformationCustomParameters=$TRANSFORMATION_CUSTOM_PARAMETERS,filteredEventsDirectory=$FILTERED_EVENTS_DIRECTORY,shardingContextFilePath=$SHARDING_CONTEXT_FILE_PATH,tableOverrides=$TABLE_OVERRIDES,columnOverrides=$COLUMN_OVERRIDES,schemaOverridesFilePath=$SCHEMA_OVERRIDES_FILE_PATH,shadowTableSpannerDatabaseId=$SHADOW_TABLE_SPANNER_DATABASE_ID,shadowTableSpannerInstanceId=$SHADOW_TABLE_SPANNER_INSTANCE_ID,failureInjectionParameter=$FAILURE_INJECTION_PARAMETER" \
298302
-f v2/datastream-to-spanner
299303
```
300304

@@ -373,6 +377,7 @@ resource "google_dataflow_flex_template_job" "cloud_datastream_to_spanner" {
373377
# schemaOverridesFilePath = ""
374378
# shadowTableSpannerDatabaseId = ""
375379
# shadowTableSpannerInstanceId = ""
380+
# failureInjectionParameter = ""
376381
}
377382
}
378383
```

v2/sourcedb-to-spanner/README_Sourcedb_to_Spanner_Flex.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ on [Metadata Annotations](https://github.com/GoogleCloudPlatform/DataflowTemplat
4545
* **namespace**: Namespace to exported. For PostgreSQL, if no namespace is provided, 'public' will be used. Defaults to empty.
4646
* **insertOnlyModeForSpannerMutations**: By default the pipeline uses Upserts to write rows to spanner. Which means existing rows would get overwritten. If InsertOnly mode is enabled, inserts would be used instead of upserts and existing rows won't be overwritten.
4747
* **batchSizeForSpannerMutations**: BatchSize in bytes for Spanner Mutations. if set less than 0, default of Apache Beam's SpannerIO is used, which is 1MB. Set this to 0 or 10, to disable batching mutations.
48+
* **spannerPriority**: The request priority for Cloud Spanner calls. The value must be one of: [`HIGH`,`MEDIUM`,`LOW`]. Defaults to `MEDIUM`.
4849
* **disabledAlgorithms**: Comma separated algorithms to disable. If this value is set to `none`, no algorithm is disabled. Use this parameter with caution, because the algorithms disabled by default might have vulnerabilities or performance issues. For example, `SSLv3, RC4`.
4950
* **extraFilesToStage**: Comma separated Cloud Storage paths or Secret Manager secrets for files to stage in the worker. These files are saved in the /extra_files directory in each worker. For example, `gs://<BUCKET_NAME>/file.txt,projects/<PROJECT_ID>/secrets/<SECRET_ID>/versions/<VERSION_ID>`.
5051

@@ -149,6 +150,7 @@ export TRANSFORMATION_CUSTOM_PARAMETERS=""
149150
export NAMESPACE=""
150151
export INSERT_ONLY_MODE_FOR_SPANNER_MUTATIONS=false
151152
export BATCH_SIZE_FOR_SPANNER_MUTATIONS=-1
153+
export SPANNER_PRIORITY=MEDIUM
152154
export DISABLED_ALGORITHMS=<disabledAlgorithms>
153155
export EXTRA_FILES_TO_STAGE=<extraFilesToStage>
154156

@@ -178,6 +180,7 @@ gcloud dataflow flex-template run "sourcedb-to-spanner-flex-job" \
178180
--parameters "namespace=$NAMESPACE" \
179181
--parameters "insertOnlyModeForSpannerMutations=$INSERT_ONLY_MODE_FOR_SPANNER_MUTATIONS" \
180182
--parameters "batchSizeForSpannerMutations=$BATCH_SIZE_FOR_SPANNER_MUTATIONS" \
183+
--parameters "spannerPriority=$SPANNER_PRIORITY" \
181184
--parameters "disabledAlgorithms=$DISABLED_ALGORITHMS" \
182185
--parameters "extraFilesToStage=$EXTRA_FILES_TO_STAGE"
183186
```
@@ -222,6 +225,7 @@ export TRANSFORMATION_CUSTOM_PARAMETERS=""
222225
export NAMESPACE=""
223226
export INSERT_ONLY_MODE_FOR_SPANNER_MUTATIONS=false
224227
export BATCH_SIZE_FOR_SPANNER_MUTATIONS=-1
228+
export SPANNER_PRIORITY=MEDIUM
225229
export DISABLED_ALGORITHMS=<disabledAlgorithms>
226230
export EXTRA_FILES_TO_STAGE=<extraFilesToStage>
227231

@@ -232,7 +236,7 @@ mvn clean package -PtemplatesRun \
232236
-Dregion="$REGION" \
233237
-DjobName="sourcedb-to-spanner-flex-job" \
234238
-DtemplateName="Sourcedb_to_Spanner_Flex" \
235-
-Dparameters="sourceDbDialect=$SOURCE_DB_DIALECT,jdbcDriverJars=$JDBC_DRIVER_JARS,jdbcDriverClassName=$JDBC_DRIVER_CLASS_NAME,sourceConfigURL=$SOURCE_CONFIG_URL,username=$USERNAME,password=$PASSWORD,tables=$TABLES,numPartitions=$NUM_PARTITIONS,fetchSize=$FETCH_SIZE,instanceId=$INSTANCE_ID,databaseId=$DATABASE_ID,projectId=$PROJECT_ID,spannerHost=$SPANNER_HOST,maxConnections=$MAX_CONNECTIONS,sessionFilePath=$SESSION_FILE_PATH,outputDirectory=$OUTPUT_DIRECTORY,transformationJarPath=$TRANSFORMATION_JAR_PATH,transformationClassName=$TRANSFORMATION_CLASS_NAME,transformationCustomParameters=$TRANSFORMATION_CUSTOM_PARAMETERS,namespace=$NAMESPACE,insertOnlyModeForSpannerMutations=$INSERT_ONLY_MODE_FOR_SPANNER_MUTATIONS,batchSizeForSpannerMutations=$BATCH_SIZE_FOR_SPANNER_MUTATIONS,disabledAlgorithms=$DISABLED_ALGORITHMS,extraFilesToStage=$EXTRA_FILES_TO_STAGE" \
239+
-Dparameters="sourceDbDialect=$SOURCE_DB_DIALECT,jdbcDriverJars=$JDBC_DRIVER_JARS,jdbcDriverClassName=$JDBC_DRIVER_CLASS_NAME,sourceConfigURL=$SOURCE_CONFIG_URL,username=$USERNAME,password=$PASSWORD,tables=$TABLES,numPartitions=$NUM_PARTITIONS,fetchSize=$FETCH_SIZE,instanceId=$INSTANCE_ID,databaseId=$DATABASE_ID,projectId=$PROJECT_ID,spannerHost=$SPANNER_HOST,maxConnections=$MAX_CONNECTIONS,sessionFilePath=$SESSION_FILE_PATH,outputDirectory=$OUTPUT_DIRECTORY,transformationJarPath=$TRANSFORMATION_JAR_PATH,transformationClassName=$TRANSFORMATION_CLASS_NAME,transformationCustomParameters=$TRANSFORMATION_CUSTOM_PARAMETERS,namespace=$NAMESPACE,insertOnlyModeForSpannerMutations=$INSERT_ONLY_MODE_FOR_SPANNER_MUTATIONS,batchSizeForSpannerMutations=$BATCH_SIZE_FOR_SPANNER_MUTATIONS,spannerPriority=$SPANNER_PRIORITY,disabledAlgorithms=$DISABLED_ALGORITHMS,extraFilesToStage=$EXTRA_FILES_TO_STAGE" \
236240
-f v2/sourcedb-to-spanner
237241
```
238242

@@ -299,6 +303,7 @@ resource "google_dataflow_flex_template_job" "sourcedb_to_spanner_flex" {
299303
# namespace = ""
300304
# insertOnlyModeForSpannerMutations = "false"
301305
# batchSizeForSpannerMutations = "-1"
306+
# spannerPriority = "MEDIUM"
302307
# disabledAlgorithms = "<disabledAlgorithms>"
303308
# extraFilesToStage = "<extraFilesToStage>"
304309
}

0 commit comments

Comments
 (0)