Skip to content

fix(Spanner): Fixed shard file config structure in reverse replication FT tests. #3933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
pratickchokhani wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −11
Draft

fix(Spanner): Fixed shard file config structure in reverse replication FT tests. #3933

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions ...m/google/cloud/teleport/v2/templates/failureinjectiontesting/SpannerToSourceDbFTBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
import static org.apache.beam.it.truthmatchers.PipelineAsserts.assertThatPipeline;

import com.google.cloud.teleport.v2.spanner.migrations.shard.Shard;
import com.google.cloud.teleport.v2.spanner.migrations.source.config.JdbcShardConfig;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.pubsub.v1.SubscriptionName;
import com.google.pubsub.v1.TopicName;
Expand All @@ -29,6 +29,7 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -102,11 +103,10 @@ protected void createAndUploadReverseShardConfigToGcs(
shard.setPassword(cloudSqlResourceManager.getPassword());
shard.setPort(String.valueOf(cloudSqlResourceManager.getPort()));
shard.setDbName(cloudSqlResourceManager.getDatabaseName());
JsonObject jsObj = new Gson().toJsonTree(shard).getAsJsonObject();
jsObj.remove("secretManagerUri"); // remove field secretManagerUri
JsonArray ja = new JsonArray();
ja.add(jsObj);
String shardFileContents = ja.toString();
JdbcShardConfig jdbcShardConfig = new JdbcShardConfig();
jdbcShardConfig.setShardConfigs(Collections.singletonList(shard));
JsonObject jsObj = new Gson().toJsonTree(jdbcShardConfig).getAsJsonObject();
String shardFileContents = jsObj.toString();
LOG.info("Shard file contents: {}", shardFileContents);
gcsResourceManager.createArtifact("input/shard.json", shardFileContents);
}
Expand All @@ -116,7 +116,7 @@ protected void createAndUploadReverseShardConfigToGcs(
List<CloudSqlResourceManager> cloudSqlResourceManagers,
String privateHost,
List<String> logicalShardIds) {
JsonArray ja = new JsonArray();
List<Shard> shardConfigs = new ArrayList<>();
for (int i = 0; i < cloudSqlResourceManagers.size(); ++i) {
Shard shard = new Shard();
shard.setLogicalShardId(logicalShardIds.get(i));
Expand All @@ -126,11 +126,12 @@ protected void createAndUploadReverseShardConfigToGcs(
shard.setPassword(cloudSqlResourceManager.getPassword());
shard.setPort(String.valueOf(cloudSqlResourceManager.getPort()));
shard.setDbName(cloudSqlResourceManager.getDatabaseName());
JsonObject jsObj = new Gson().toJsonTree(shard).getAsJsonObject();
jsObj.remove("secretManagerUri"); // remove field secretManagerUri
ja.add(jsObj);
shardConfigs.add(shard);
}
String shardFileContents = ja.toString();
JdbcShardConfig jdbcShardConfig = new JdbcShardConfig();
jdbcShardConfig.setShardConfigs(shardConfigs);
JsonObject jsObj = new Gson().toJsonTree(jdbcShardConfig).getAsJsonObject();
String shardFileContents = jsObj.toString();
LOG.info("Shard file contents: {}", shardFileContents);
gcsResourceManager.createArtifact("input/shard.json", shardFileContents);
}
Expand Down
Loading