Skip to content
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 3 commits into from
Dec 8, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
17 changes: 17 additions & 0 deletions dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,23 @@
</target>
</configuration>
</execution>
<execution>
<id>check-shims-versions</id>
<phase>package</phase>
Copy link
Collaborator

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 a generate-resources execution. On the other hand check-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

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good comment!
Updated.

<configuration>
<target>
<property name="included_buildvers" value="${included_buildvers}"/>
<exec executable="${project.basedir}/scripts/check-shims-revisions.sh"
dir="${project.build.directory}">
<arg value="${included_buildvers}"/>
</exec>

</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
Expand Down
52 changes: 52 additions & 0 deletions dist/scripts/check-shims-revisions.sh
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"