[FLINK-13592][e2e] Fix hardcoded flink version in tpch end-to-end test. #9368

KurtYoung · 2019-08-06T06:36:24Z

What is the purpose of the change

Fix hardcoded flink version in tpch end-to-end test.

Brief change log

Use auto fetched flink version in tpch end-to-end test.
Changes test parallelism to 2 to cover the situation that parallelism is higher than the slot number, since the testing cluster only have one task manager and contains only one slot.

Verifying this change

Tested on a linux server and passed.

flinkbot · 2019-08-06T06:37:54Z

Thanks a lot for your contribution to the Apache Flink project. I'm the @flinkbot. I help the community
to review your pull request. We will use this comment to track the progress of the review.

Automated Checks

Last check on commit 4e442c2 (Tue Aug 06 16:04:02 UTC 2019)

Warnings:

1 pom.xml files were touched: Check for build and licensing issues.
No documentation files were touched! Remember to keep the Flink docs up to date!

_{Mention the bot in a comment to re-run the automated checks.}

Review Progress

❓ 1. The [description] looks good.
❓ 2. There is [consensus] that the contribution should go into to Flink.
❓ 3. Needs [attention] from.
❓ 4. The change fits into the overall [architecture].
❓ 5. Overall code [quality] is good.

Please see the Pull Request Review Guide for a full explanation of the review process.

Details

The Bot is tracking the review progress through labels. Labels are applied according to the order of the review items. For consensus, approval by a Flink committer of PMC member is required

Bot commands

The @flinkbot bot supports the following commands:

@flinkbot approve description to approve one or more aspects (aspects: description, consensus, architecture and quality)
@flinkbot approve all to approve all aspects
@flinkbot approve-until architecture to approve everything until architecture
@flinkbot attention @username1 [@username2 ..] to require somebody's attention
@flinkbot disapprove architecture to remove an approval you gave earlier

flinkbot · 2019-08-06T06:43:47Z

CI report:

bdd47f0 : CANCELED Build
a6ca499 : CANCELED Build
5963462 : SUCCESS Build
01cb27e : CANCELED Build
4e442c2 : SUCCESS Build

Also changed test parallelism to 2 to cover the situation that parallelism is higher than the slot number, since the testing cluster only have one task manager and contains only one slot

wuchong · 2019-08-06T08:08:57Z

flink-end-to-end-tests/test-scripts/test_tpch.sh

 TARGET_DIR="$END_TO_END_DIR/flink-tpch-test/target"
 TPCH_DATA_DIR="$END_TO_END_DIR/test-scripts/test-data/tpch"
-java -cp "$TARGET_DIR/flink-tpch-test-1.10-SNAPSHOT.jar:$TARGET_DIR/lib/*" org.apache.flink.table.tpch.TpchDataGenerator "$SCALE" "$TARGET_DIR"
+FLINK_VERSION=`ls "${END_TO_END_DIR}/../flink-table/flink-table-api-java/target" | sed -n "s/.*flink-table-api-java-\(.*\)-tests\.jar/\1/p" | uniq`


FLINK_VERSION has been defined in common.sh, maybe we can use it directly.

wuchong · 2019-08-06T08:09:55Z

flink-end-to-end-tests/test-scripts/test_tpch.sh

-java -cp "$TARGET_DIR/flink-tpch-test-1.10-SNAPSHOT.jar:$TARGET_DIR/lib/*" org.apache.flink.table.tpch.TpchDataGenerator "$SCALE" "$TARGET_DIR"
+FLINK_VERSION=`ls "${END_TO_END_DIR}/../flink-table/flink-table-api-java/target" | sed -n "s/.*flink-table-api-java-\(.*\)-tests\.jar/\1/p" | uniq`
+
+java -cp "$TARGET_DIR/flink-tpch-test-"$FLINK_VERSION".jar:$TARGET_DIR/lib/*" org.apache.flink.table.tpch.TpchDataGenerator "$SCALE" "$TARGET_DIR"


Suggested change

java -cp "$TARGET_DIR/flink-tpch-test-"$FLINK_VERSION".jar:$TARGET_DIR/lib/*" org.apache.flink.table.tpch.TpchDataGenerator "$SCALE" "$TARGET_DIR"

java -cp "${TARGET_DIR}/flink-tpch-test-${FLINK_VERSION}.jar:$TARGET_DIR/lib/*" org.apache.flink.table.tpch.TpchDataGenerator "$SCALE" "$TARGET_DIR"

dawidwys

How about we take the same approach as for other e2e tests, e.g. like test_streaming_bucketing.sh. We usually just rename the end jar so it doesn't include the version.

We use your approach only if we need to use jars from the dist, which we can't strip off from version.

WDYT?

dawidwys · 2019-08-06T08:11:28Z

flink-end-to-end-tests/test-scripts/test_tpch.sh

  planner: blink
  type: batch
  result-mode: table
+  parallelism: 2


Do we need this change? It's unrelated to the subject of the commit.

It's a supplement to this issue: https://issues.apache.org/jira/browse/FLINK-13441. I think this is also a good place to cover such scenarios, and don't need to open a jira for it.

How is this related to the linked issue? Honestly I still don't get what is the purpose of this change.

I disagree this is a good place to add such cases. It's impossible to link this change to the reason why it was introduced. I'm not saying we need a new JIRA issue, but it should at least be in a separate hotfix commit with at least brief explanation what it does.

I explained this change in the commit message if you missed that:

Also changed test parallelism to 2 to cover the situation that parallelism is higher than the slot number, since the testing cluster only have one task manager and contains only one slot

I agree this can be isolated to another commit.

You are right I missed it, sorry for that. Now I get it. I think this would be a perfect description for the extracted commit (and easier to find)

Yeah, I already did the exactly thing in my last commit.

wuchong · 2019-08-06T08:36:08Z

+1 for strip off version.

KurtYoung · 2019-08-06T12:49:29Z

Striping off version sounds good, I will change it.

This can help to cover the situation that parallelism is higher than the slot number, since the testing cluster only have one task manager and contains only one slot.

KurtYoung · 2019-08-06T13:32:21Z

@dawidwys Thanks for the reviewing, I tested locally again in my laptop and passed. I will merge this if you don't have any further comment.

dawidwys

No I have no more comments, feel free to merge it. Thank you @KurtYoung for the updates.

This closes #9368. (cherry picked from commit 648fc72)

This closes apache#9368.

rmetzger added the review=description? label Aug 6, 2019

KurtYoung force-pushed the tpch-e2e branch from bdd47f0 to a6ca499 Compare August 6, 2019 06:49

[FLINK-13592][e2e] Fix hardcoded flink version in tpch end-to-end test.

5963462

Also changed test parallelism to 2 to cover the situation that parallelism is higher than the slot number, since the testing cluster only have one task manager and contains only one slot

KurtYoung force-pushed the tpch-e2e branch from a6ca499 to 5963462 Compare August 6, 2019 06:53

rmetzger added the component=Tests label Aug 6, 2019

wuchong reviewed Aug 6, 2019

View reviewed changes

dawidwys requested changes Aug 6, 2019

View reviewed changes

KurtYoung added 3 commits August 6, 2019 20:51

strip off the tpch test jar version

01cb27e

revert parallelism change

b05f288

[hotfix] Change the parallelism of tpch end-to-end test to 2.

4e442c2

This can help to cover the situation that parallelism is higher than the slot number, since the testing cluster only have one task manager and contains only one slot.

dawidwys approved these changes Aug 6, 2019

View reviewed changes

KurtYoung closed this in 648fc72 Aug 6, 2019

KurtYoung added a commit that referenced this pull request Aug 6, 2019

[FLINK-13592][e2e] Fix hardcoded flink version in tpch end-to-end test.

13de7c3

This closes #9368. (cherry picked from commit 648fc72)

KurtYoung deleted the tpch-e2e branch August 6, 2019 14:07

becketqin pushed a commit to becketqin/flink that referenced this pull request Aug 17, 2019

[FLINK-13592][e2e] Fix hardcoded flink version in tpch end-to-end test.

45a392b

This closes apache#9368.

becketqin pushed a commit to becketqin/flink that referenced this pull request Aug 19, 2019

[FLINK-13592][e2e] Fix hardcoded flink version in tpch end-to-end test.

3282e20

This closes apache#9368.

	java -cp "$TARGET_DIR/flink-tpch-test-"$FLINK_VERSION".jar:$TARGET_DIR/lib/*" org.apache.flink.table.tpch.TpchDataGenerator "$SCALE" "$TARGET_DIR"
	java -cp "${TARGET_DIR}/flink-tpch-test-${FLINK_VERSION}.jar:$TARGET_DIR/lib/*" org.apache.flink.table.tpch.TpchDataGenerator "$SCALE" "$TARGET_DIR"

[FLINK-13592][e2e] Fix hardcoded flink version in tpch end-to-end test. #9368

[FLINK-13592][e2e] Fix hardcoded flink version in tpch end-to-end test. #9368

Uh oh!

Conversation

KurtYoung commented Aug 6, 2019

What is the purpose of the change

Brief change log

Verifying this change

Uh oh!

flinkbot commented Aug 6, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Automated Checks

Review Progress

Uh oh!

flinkbot commented Aug 6, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

CI report:

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dawidwys left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dawidwys Aug 6, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

wuchong commented Aug 6, 2019

Uh oh!

KurtYoung commented Aug 6, 2019

Uh oh!

KurtYoung commented Aug 6, 2019

Uh oh!

dawidwys left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

flinkbot commented Aug 6, 2019 •

edited

Loading

flinkbot commented Aug 6, 2019 •

edited

Loading

dawidwys Aug 6, 2019 •

edited

Loading