Skip to content

Commit cbc320a

Browse files
SpannerToCassandraSourceLT fails with FileNotFoundException for session.json (#3342)
* initial changes * Triggering load tests
1 parent e6e7d8b commit cbc320a

File tree

4 files changed

+19
-16
lines changed

4 files changed

+19
-16
lines changed

v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToCassandraSourceLT.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.apache.beam.it.gcp.datagenerator.DataGenerator;
3333
import org.junit.After;
3434
import org.junit.Before;
35-
import org.junit.Ignore;
3635
import org.junit.Test;
3736
import org.junit.experimental.categories.Category;
3837
import org.junit.runner.RunWith;
@@ -43,7 +42,6 @@
4342
@Category(TemplateLoadTest.class)
4443
@TemplateLoadTest(SpannerToSourceDb.class)
4544
@RunWith(JUnit4.class)
46-
@Ignore("Disabling incorrect LT. b/446480838")
4745
public class SpannerToCassandraSourceLT extends SpannerToCassandraLTBase {
4846

4947
private static final Logger LOG = LoggerFactory.getLogger(SpannerToCassandraSourceLT.class);
@@ -68,8 +66,7 @@ public void setup() throws IOException {
6866
artifactBucket,
6967
gcsResourceManager
7068
.uploadArtifact(
71-
"input/schema.json",
72-
Resources.getResource(dataGeneratorSchemaResource).getPath())
69+
SCHEMA_FILE_NAME, Resources.getResource(dataGeneratorSchemaResource).getPath())
7370
.name());
7471
jobInfo =
7572
launchDataflowJob(
@@ -78,7 +75,8 @@ public void setup() throws IOException {
7875
maxWorkers,
7976
null,
8077
CASSANDRA_SOURCE_TYPE,
81-
SOURCE_SHARDS_FILE_NAME);
78+
SOURCE_SHARDS_FILE_NAME,
79+
null);
8280
}
8381

8482
@After

v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToMySqlCustomTransformationLT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ public void setup() throws IOException, InterruptedException {
7272
artifactBucket,
7373
gcsResourceManager
7474
.uploadArtifact(
75-
"input/schema.json",
76-
Resources.getResource(dataGeneratorSchemaResource).getPath())
75+
SCHEMA_FILE_NAME, Resources.getResource(dataGeneratorSchemaResource).getPath())
7776
.name());
7877

7978
createMySQLSchema(jdbcResourceManagers);
@@ -89,7 +88,8 @@ public void setup() throws IOException, InterruptedException {
8988
maxWorkers,
9089
customTransformation,
9190
MYSQL_SOURCE_TYPE,
92-
SOURCE_SHARDS_FILE_NAME);
91+
SOURCE_SHARDS_FILE_NAME,
92+
SESSION_FILE_NAME);
9393
}
9494

9595
@After

v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToMySqlSourceLT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ public void setup() throws IOException {
7272
artifactBucket,
7373
gcsResourceManager
7474
.uploadArtifact(
75-
"input/schema.json",
76-
Resources.getResource(dataGeneratorSchemaResource).getPath())
75+
SCHEMA_FILE_NAME, Resources.getResource(dataGeneratorSchemaResource).getPath())
7776
.name());
7877

7978
createMySQLSchema(jdbcResourceManagers);
@@ -84,7 +83,8 @@ public void setup() throws IOException {
8483
maxWorkers,
8584
null,
8685
MYSQL_SOURCE_TYPE,
87-
SOURCE_SHARDS_FILE_NAME);
86+
SOURCE_SHARDS_FILE_NAME,
87+
SESSION_FILE_NAME);
8888
}
8989

9090
@After

v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/SpannerToSourceDbLTBase.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ public class SpannerToSourceDbLTBase extends TemplateLoadTestBase {
5656

5757
private static final Logger LOG = LoggerFactory.getLogger(SpannerToSourceDbLTBase.class);
5858
public static final String SOURCE_SHARDS_FILE_NAME = "input/shard.json";
59+
public static final String SESSION_FILE_NAME = "input/session.json";
60+
public static final String SCHEMA_FILE_NAME = "input/schema.json";
5961
private static final String TEMPLATE_SPEC_PATH =
6062
MoreObjects.firstNonNull(
6163
TestProperties.specPath(), "gs://dataflow-templates/latest/flex/Spanner_to_SourceDb");
@@ -76,7 +78,7 @@ public void setupResourceManagers(
7678
GcsResourceManager.builder(artifactBucket, getClass().getSimpleName(), CREDENTIALS).build();
7779

7880
gcsResourceManager.uploadArtifact(
79-
"input/session.json", Resources.getResource(sessionFileResource).getPath());
81+
SESSION_FILE_NAME, Resources.getResource(sessionFileResource).getPath());
8082

8183
pubsubResourceManager = setUpPubSubResourceManager();
8284
subscriptionName =
@@ -193,16 +195,19 @@ public PipelineLauncher.LaunchInfo launchDataflowJob(
193195
int maxWorkers,
194196
CustomTransformation customTransformation,
195197
String sourceType,
196-
String shardFileName)
198+
String shardFileName,
199+
String sessionFileName)
197200
throws IOException {
198201
// default parameters
199202

200203
Map<String, String> params =
201204
new HashMap<>() {
202205
{
203-
put(
204-
"sessionFilePath",
205-
getGcsPath(artifactBucket, "input/session.json", gcsResourceManager));
206+
if (sessionFileName != null) {
207+
put(
208+
"sessionFilePath",
209+
getGcsPath(artifactBucket, sessionFileName, gcsResourceManager));
210+
}
206211
put("instanceId", spannerResourceManager.getInstanceId());
207212
put("databaseId", spannerResourceManager.getDatabaseId());
208213
put("spannerProjectId", project);

0 commit comments

Comments
 (0)