-
Notifications
You must be signed in to change notification settings - Fork 240
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.
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
Check revisions for all shim jars while build all #4266
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
#!/bin/bash | ||
|
||
# | ||
# Copyright (c) 2021, NVIDIA CORPORATION. All rights reserved. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
# | ||
|
||
set -e | ||
# | ||
# check the revisions of each shims, they should be equal | ||
# $1 is included_buildvers | ||
function check-shims-revisions() { | ||
included_buildvers="$1" | ||
# PWD should be spark-rapids root path | ||
parallel_dir=${PWD}/parallel-world | ||
pre_revision="" | ||
pre_shim_version_path="" | ||
|
||
IFS="," | ||
for shim in ${included_buildvers}; do | ||
# trim | ||
shim=$(echo "${shim}" | xargs) | ||
shim_version_path="${parallel_dir}/spark${shim}/rapids4spark-version-info.properties" | ||
if [[ -f "$shim_version_path" ]] ; then | ||
curr_revision=$(grep "revision=" "${shim_version_path}" | cut -d'=' -f2) | ||
if [ -n "$pre_revision" ] && [[ "$curr_revision" != "$pre_revision" ]] ; then | ||
echo | ||
echo "Check Failed: git revisions between shims are not equal" | ||
echo "Please check the revisions of each shim to see which one is inconsistent. Note, if building with Databricks those jars are built separately." | ||
exit 1 | ||
fi | ||
pre_revision="${curr_revision}" | ||
pre_shim_version_path="${shim_version_path}" | ||
else | ||
echo "Error: version file missing: ${shim_version_path}" | ||
exit 1 | ||
fi | ||
done | ||
} | ||
|
||
check-shims-revisions "$1" |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the scenario from #4265, making it run
package
means that we hit the secondary problem first because bindary-dedupe is run inside build-parallel-worlds which is agenerate-resources
execution. On the other handcheck-shims-revisions.sh
relies on the build-parallel-worlds to unzip aggregator dependencies.So I think to avoid a major refactoring and still get check-shims-revisions.sh called in time, we need to move its call to between the unzip loop and call to binary-dedupe
spark-rapids/dist/maven-antrun/build-parallel-worlds.xml
Line 120 in 3e27acc
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good comment!
Updated.