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.

Sign up for GitHub

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

Jump to bottom

Issue:2840 Create bookie shellscript for gradle #2841

Merged
merged 1 commit into from
Oct 22, 2021
Merged

Issue:2840 Create bookie shellscript for gradle #2841

merged 1 commit into from
Oct 22, 2021

Conversation

pkumar-singh
Copy link
Member

@pkumar-singh pkumar-singh commented Oct 21, 2021 •
edited
Loading

Motivation

When built using gradle path of the libs changes from target/ to build/libs/.
Therefore, script does not find jar files and tries to run mvn package.

To Reproduce

  1. Build using gradle ./gradlew build -x test -x checkstyleMain -x checkstyleTest -x spotbugsTest -x spotbugsMain -x rat -x signDistTar
  2. Try and run
    bin/bookkeeper standalone
    Output:
    Couldn't find module '(org.apache.bookkeeper-)?bookkeeper-server' jar.
    Do you want me to run mvn package -DskipTests for you ? (y|n) y

Changes

Write a separate script for gradle with correct path for libs for gradle.
If jars not found in build/libs then. Script should create those jars and setup the classpath.
At the same time bookkeeper_server was not pulling two runtime dependencies.

After change

bin/bookkeeper_gradle localbookie 3
Bring up bookie and work fine.

bookkeeper % bin/bookkeeper_gradle localbookie 3                               
2021-10-21T12:21:44,711 - INFO  - [main:LocalBookKeeper@458] - Using configuration file /Users/prashantk/oss/bookkeeper/conf/bk_server.conf
2021-10-21T12:21:44,719 - INFO  - [main:LocalBookKeeper@90] - Running 3 bookie(s) on zk ensemble = '127.0.0.1:2181'.
2021-10-21T12:21:44,723 - INFO  - [main:LocalBookKeeper@120] - Starting ZK server
2021-10-21T12:21:44,735 - INFO  - [main:ZookeeperBanner@42] -

@mauricebarnum
Copy link
Contributor

mauricebarnum commented Oct 21, 2021 •
edited
Loading

worked for me. it'd be nice if we could keep the 'bookkeeper' script name and factor common.sh into three parts: common, mvn specific, gradle specific. maybe for a future iteration.

a most accurate split would be: installed jars, jars fetched from mvn repo, locally built jars. for the last, that's currently maven or gradle, but will eventually be just gradle until the next build migration.

@pkumar-singh
Copy link
Member Author

worked for me. it'd be nice if we could keep the 'bookkeeper' script name and factor common.sh into three parts: common, mvn specific, gradle specific. maybe for a future iteration.

a most accurate split would be: installed jars, jars fetched from mvn repo, locally built jars. for the last, that's currently maven or gradle, but will eventually be just gradle until the next build migration.

Two things.

  • No mixing with maven that's the first principal for gradle upgrade. Let maven be as it is till we pull the plug on maven.
  • Once we pull the plug on maven which should be atomic operation as much as possible. Rename this script and all other scripts to default, that is remove 'gradle' from their names. For example rename bookkeeper-gradle to bookkeeper

@pkumar-singh
Copy link
Member Author

rerun failure checks

@merlimat merlimat added this to the 4.15.0 milestone Oct 21, 2021
@mauricebarnum
Copy link
Contributor

  • No mixing with maven that's the first principal for gradle upgrade. Let maven be as it is till we pull the plug on maven.

no mixing build systems. but we still use maven as an artifact repository, which these scripts also facilitate.

hsaputra
hsaputra approved these changes Oct 22, 2021
View reviewed changes
Copy link
Contributor

@hsaputra hsaputra left a comment

Choose a reason for hiding this comment

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

LGTM +1

Will move this gradle base to be the default the same time we remove Maven build scripts.

@hsaputra hsaputra merged commit 919fdd3 into apache:master Oct 22, 2021
This was referenced Oct 25, 2021
Closed
Merged
hsaputra pushed a commit that referenced this pull request Oct 29, 2021
@nicoloboschi
Gradle build - some submodules are skipped
98ddf81 
### Motivation

In order to complete migration to Gradle we must build all the subprojects.

### Changes

- Enabled `sh` integration tests with gradle, located in `tests/scripts/src/test/bash/gradle`
- Added these modules to the build
    - `bookkeeper-http:servlet-http-server` 
    - `metadata-drivers:etcd`
    - `tests:backward-compat:*`
    - `tests:shaded:*`
    - `stream:bk-grpc-name-resolver`
- DL shading process is now performed (before it didn't build any jar)
- Groovy tests (`tests:backward-compat:*`) now are triggered by the build/tests itself; with Maven, there is a "runner" project (`tests/integration-tests-base-groovy`); in Gradle is useless so it is skipped


### Test

- Both `bin/bookkeper standalone` and `bin/bookkeper_gradle standalone` work locally
- Tests are passing locally  

Master Issue: #2849



Reviewers: Henry Saputra <[email protected]>, Prashant Kumar <None>

This closes #2850 from nicoloboschi/fix/2849/gradle and squashes the following commits:

00b49f4 [Nicolò Boschi] Fix common_gradle.sh regex
bd739fd [Nicolò Boschi] fix sh tests
43230ba [Nicolò Boschi] revert sh files. Avoid to modify maven files, create gradle versions to faciltate migration
d1f95e4 [Nicolò Boschi] fix shaded deps
bcab40d [Nicolò Boschi] fix build
5fd0341 [Nicolò Boschi] fix build
0082e0e [Nicolò Boschi] fix build
2c32ac1 [Nicolò Boschi] fixes
3bc0b26 [Nicolò Boschi] bookkeeper-server-shaded-tests
ba89132 [Nicolò Boschi] shaded tests
6d39e33 [Nicolò Boschi] sh tests
e0032bc [Nicolò Boschi] actually run arquillian groovy tests
08dcc39 [Nicolò Boschi] backwards
2361f79 [Nicolò Boschi] hierarchical-ledger-manager
8388e11 [Nicolò Boschi] current-server-old-clients
6a24344 [Nicolò Boschi] bc-non-fips
2faca01 [Nicolò Boschi] bk-grpc-name-resolver
991bc11 [Nicolò Boschi] servlet-http-server
675ef7b [Nicolò Boschi] etcd
b1d5e14 [ZhangJian He] A empty implement in EtcdLedgerManagerFactory to let the project can compile (#2845)
bd5c50b [shustsud] Add error handling to readLedgerMetadata in over-replicated ledger GC (#2844)
746f9f6 [Matteo Merli] Remove direct ZK access for Auditor (#2842)
4117200 [ZhangJian He] the compare should be >= instead of > (#2782)
14ef56f [Prashant Kumar] BookieId can not be cast to BookieSocketAddress (#2843)
e10f3fe [ZhangJian He] Forget to close preAllocator log on shutdown (#2819)
53954ca [shustsud] Add ensemble check to over-replicated ledger GC (#2813)
919fdd3 [Prashant Kumar] Issue:2840 Create bookie shellscript for gradle (#2841)
031d168 [gaozhangmin] fix-npe-when-pulsar-ZkBookieRackAffinityMapping-getBookieAddressResolver (#2788)
3dd671c [Prashant Kumar] Migrate bookkeepr-server:test to gradle run unit tests excepts org.apache.bookkeeper.bookie. org.apache.bookkeeper.client org.apache.bookkeeper.replication org.apache.bookkeeper.tls. (#2812)
f6903b8 [Jack Vanlightly] BP-44 USE metrics
a4afaa4 [Matteo Merli] Eliminate direct ZK access in ScanAndCompareGarbageCollector (#2833)
a9b576d [Yunze Xu] Release semaphore when addEntry accepts the same entries (#2832)
148bf22 [Yun Tang] Ensure to release cache during KeyValueStorageRocksDB#closec (#2821)
4dc4260 [gaozhangmin] Heap memory leak problem when ledger replication failed (#2794)
a522fa3 [Raúl Gracia] Issue 2815: Upgrade to log4j2 to get rid of CVE-2019-17571 (#2816)
0465052 [Nicolò Boschi] Upgrade httpclient from 4.5.5 to 4.5.13 (#2793)
594a056 [Raúl Gracia] Issue 2795: Bookkeeper upgrade using Bookie ID may fail due to cookie mismatch (#2796)
354cf37 [Raúl Gracia] Upgraded dependencies with CVEs (#2792)
e413c70 [Raúl Gracia] Issue 2728: Entry Log GC may get blocked when using entryLogPerLedgerEnabled option (#2779)
883231e [pradeepbn] Building bookkeeper with gradle on java11
Ghatage pushed a commit to sijie/bookkeeper that referenced this pull request Jul 12, 2024
@pkumar-singh
Issue:2840 Create bookie shellscript for gradle (apache#2841)
db13681 
Co-authored-by: Prashant Kumar <[email protected]>
Ghatage pushed a commit to sijie/bookkeeper that referenced this pull request Jul 12, 2024
@nicoloboschi
Gradle build - some submodules are skipped
ff821cb 
### Motivation

In order to complete migration to Gradle we must build all the subprojects.

### Changes

- Enabled `sh` integration tests with gradle, located in `tests/scripts/src/test/bash/gradle`
- Added these modules to the build
    - `bookkeeper-http:servlet-http-server` 
    - `metadata-drivers:etcd`
    - `tests:backward-compat:*`
    - `tests:shaded:*`
    - `stream:bk-grpc-name-resolver`
- DL shading process is now performed (before it didn't build any jar)
- Groovy tests (`tests:backward-compat:*`) now are triggered by the build/tests itself; with Maven, there is a "runner" project (`tests/integration-tests-base-groovy`); in Gradle is useless so it is skipped


### Test

- Both `bin/bookkeper standalone` and `bin/bookkeper_gradle standalone` work locally
- Tests are passing locally  

Master Issue: apache#2849



Reviewers: Henry Saputra <[email protected]>, Prashant Kumar <None>

This closes apache#2850 from nicoloboschi/fix/2849/gradle and squashes the following commits:

00b49f4 [Nicolò Boschi] Fix common_gradle.sh regex
bd739fd [Nicolò Boschi] fix sh tests
43230ba [Nicolò Boschi] revert sh files. Avoid to modify maven files, create gradle versions to faciltate migration
d1f95e4 [Nicolò Boschi] fix shaded deps
bcab40d [Nicolò Boschi] fix build
5fd0341 [Nicolò Boschi] fix build
0082e0e [Nicolò Boschi] fix build
2c32ac1 [Nicolò Boschi] fixes
3bc0b26 [Nicolò Boschi] bookkeeper-server-shaded-tests
ba89132 [Nicolò Boschi] shaded tests
6d39e33 [Nicolò Boschi] sh tests
e0032bc [Nicolò Boschi] actually run arquillian groovy tests
08dcc39 [Nicolò Boschi] backwards
2361f79 [Nicolò Boschi] hierarchical-ledger-manager
8388e11 [Nicolò Boschi] current-server-old-clients
6a24344 [Nicolò Boschi] bc-non-fips
2faca01 [Nicolò Boschi] bk-grpc-name-resolver
991bc11 [Nicolò Boschi] servlet-http-server
675ef7b [Nicolò Boschi] etcd
b1d5e14 [ZhangJian He] A empty implement in EtcdLedgerManagerFactory to let the project can compile (apache#2845)
bd5c50b [shustsud] Add error handling to readLedgerMetadata in over-replicated ledger GC (apache#2844)
746f9f6 [Matteo Merli] Remove direct ZK access for Auditor (apache#2842)
4117200 [ZhangJian He] the compare should be >= instead of > (apache#2782)
14ef56f [Prashant Kumar] BookieId can not be cast to BookieSocketAddress (apache#2843)
e10f3fe [ZhangJian He] Forget to close preAllocator log on shutdown (apache#2819)
53954ca [shustsud] Add ensemble check to over-replicated ledger GC (apache#2813)
919fdd3 [Prashant Kumar] Issue:2840 Create bookie shellscript for gradle (apache#2841)
031d168 [gaozhangmin] fix-npe-when-pulsar-ZkBookieRackAffinityMapping-getBookieAddressResolver (apache#2788)
3dd671c [Prashant Kumar] Migrate bookkeepr-server:test to gradle run unit tests excepts org.apache.bookkeeper.bookie. org.apache.bookkeeper.client org.apache.bookkeeper.replication org.apache.bookkeeper.tls. (apache#2812)
f6903b8 [Jack Vanlightly] BP-44 USE metrics
a4afaa4 [Matteo Merli] Eliminate direct ZK access in ScanAndCompareGarbageCollector (apache#2833)
a9b576d [Yunze Xu] Release semaphore when addEntry accepts the same entries (apache#2832)
148bf22 [Yun Tang] Ensure to release cache during KeyValueStorageRocksDB#closec (apache#2821)
4dc4260 [gaozhangmin] Heap memory leak problem when ledger replication failed (apache#2794)
a522fa3 [Raúl Gracia] Issue 2815: Upgrade to log4j2 to get rid of CVE-2019-17571 (apache#2816)
0465052 [Nicolò Boschi] Upgrade httpclient from 4.5.5 to 4.5.13 (apache#2793)
594a056 [Raúl Gracia] Issue 2795: Bookkeeper upgrade using Bookie ID may fail due to cookie mismatch (apache#2796)
354cf37 [Raúl Gracia] Upgraded dependencies with CVEs (apache#2792)
e413c70 [Raúl Gracia] Issue 2728: Entry Log GC may get blocked when using entryLogPerLedgerEnabled option (apache#2779)
883231e [pradeepbn] Building bookkeeper with gradle on java11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hsaputra hsaputra hsaputra approved these changes

@merlimat merlimat merlimat approved these changes

Assignees

@pkumar-singh pkumar-singh

Labels
area/build type/feature
Projects
None yet
Milestone
4.15.0
Development

Successfully merging this pull request may close these issues.
4 participants
@pkumar-singh @mauricebarnum @merlimat @hsaputra