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

HDDS-7581. Fix update-jar-report for snapshot versions #4034

Merged
merged 1 commit into from Dec 5, 2022

Conversation

adoroszlai
Copy link
Contributor

@adoroszlai adoroszlai commented Dec 2, 2022

What changes were proposed in this pull request?

Pattern matching for jar version numbers in update-jar-report.sh does not correctly work for ratis-*-2.4.2-8b8bdda-SNAPSHOT.

Expected:

share/ozone/lib/ratis-client.jar
share/ozone/lib/ratis-common.jar
share/ozone/lib/ratis-grpc.jar
share/ozone/lib/ratis-metrics.jar
share/ozone/lib/ratis-netty.jar
share/ozone/lib/ratis-proto.jar
share/ozone/lib/ratis-server-api.jar
share/ozone/lib/ratis-server.jar

Actual:

share/ozone/lib/ratis-clientbdda-SNAPSHOT.jar
share/ozone/lib/ratis-commonbdda-SNAPSHOT.jar
share/ozone/lib/ratis-grpcbdda-SNAPSHOT.jar
share/ozone/lib/ratis-metricsbdda-SNAPSHOT.jar
share/ozone/lib/ratis-nettybdda-SNAPSHOT.jar
share/ozone/lib/ratis-protobdda-SNAPSHOT.jar
share/ozone/lib/ratis-server-apibdda-SNAPSHOT.jar
share/ozone/lib/ratis-serverbdda-SNAPSHOT.jar

The problem is that -[0-9]+(.[0-9]+)* matches -2.4.2-8b8 instead of -2.4.2, since . is "any char". We should only accept a literal ..

https://issues.apache.org/jira/browse/HDDS-7581

How was this patch tested?

$ echo 'ratis-server-2.4.2-8b8bdda-SNAPSHOT.jar' \
    | perl -wpl -e 's/-[0-9]+(\.[0-9]+)*(-([0-9a-z]+-)?SNAPSHOT)?+//g; s/\.v\d+\.jar/.jar/g;'
ratis-server.jar

Also executed build and dependency check both for current ratis-2.4.1 and for ratis-2.4.2-8b8bdda-SNAPSHOT (from HDDS-7555).

https://github.com/adoroszlai/hadoop-ozone/actions/runs/3601990535/jobs/6068627412

@adoroszlai adoroszlai self-assigned this Dec 2, 2022
@adoroszlai adoroszlai changed the title HDDS-7581. Fix update-jar-report for snapshot HDDS-7581. Fix update-jar-report for snapshot versions Dec 2, 2022
Copy link
Contributor

@ChenSammi ChenSammi left a comment

Choose a reason for hiding this comment

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

+1. Thanks @adoroszlai .

@ChenSammi ChenSammi merged commit 47a5671 into apache:master Dec 5, 2022
@adoroszlai adoroszlai deleted the HDDS-7581 branch December 5, 2022 08:14
@adoroszlai
Copy link
Contributor Author

Thanks @ChenSammi for reviewing and committing it.

Galsza pushed a commit to Galsza/ozone that referenced this pull request Dec 7, 2022
errose28 added a commit to errose28/ozone that referenced this pull request Dec 12, 2022
* master: (110 commits)
  HDDS-7472. EC: Fix NSSummaryEndpoint#getDiskUsage for EC keys (apache#3987)
  HDDS-5704. Ozone URI syntax description in help content needs to mention about ozone service id (apache#3862)
  HDDS-7555. Upgrade Ratis to 2.4.2-8b8bdda-SNAPSHOT. (apache#4028)
  HDDS-7541. FSO recursive delete directory with hierarchy takes much time for cleanup (apache#4008)
  HDDS-7581. Fix update-jar-report for snapshot (apache#4034)
  HDDS-7253. Fix exception when '/' in key name (apache#4038)
  HDDS-7579. Use Netty 4.1.77 for consistency (apache#4031)
  HDDS-7562. Suppress warning about long filenames in tar (apache#4017)
  HDDS-7563. Add a handler for under replicated Ratis containers in RM (apache#4025)
  HDDS-7497. Fix mkdir does not update bucket's usedNamespace (apache#3969)
  HDDS-7567. Invalid entries in LICENSE (apache#4020)
  HDDS-7575. Correct showing of RATIS-THREE icon in Recon UI (apache#4026)
  HDDS-7540. Let reusable workflow inherit secrets (apache#4012)
  HDDS-7568. Bump copyright year in NOTICE (apache#4018)
  HDDS-7394. OM RPC FairCallQueue decay decision metrics list caller username in the metric (apache#3878)
  HDDS-7510. Recon: Return number of open containers in `/clusterState` endpoint (apache#3989)
  HDDS-7561. Improve setquota, clrquota CLI usage (apache#4016)
  HDDS-6615. EC: Improve write performance by pipelining encode and flush (apache#3994)
  HDDS-7554. Recon UI should show DORMANT in pipeline status filter (apache#4010)
  HDDS-7540. Separate scheduled CI from push/PR workflows (apache#4004)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants