Skip to content

Conversation

@briaugenreich
Copy link

I cherry picked these changes from branch-2, but I can manually apply them if that would be better as well.

HBASE-26308 - ensures the sum of the multipliers is always properly calculated and gives us more details in the balancer log output.

…ot populated properly when we have a shortcut for trigger (apache#3783)
@bbeaudreault
Copy link
Member

nice! lgtm. I'm not sure what you mean by your first setnence. If you mean git cherry-pick vs manually going line-by-line and making the same changes, I'm definitely ok with cherry-pick.

@briaugenreich
Copy link
Author

I'm not sure what you mean by your first setnence.

yeah sorry that wasnt clear you understood correctly.

Good to merge this? Or do we get a couple reviews internally too? Also when I squash and merge do you usually keep HubSpot Backport in the commit message ?

@bbeaudreault
Copy link
Member

Looks good. I've been backporting lots of jiras and spend 95% of my time in the hbase code base these days so I feel like my review is good enough :D

Yea, keep the HubSpot Backport when squash/merge

@briaugenreich briaugenreich merged commit 4a38b00 into hubspot-2 Mar 3, 2022
@briaugenreich briaugenreich deleted the hubspot-backport-HBASE-26308-2 branch March 3, 2022 15:21
bbeaudreault added a commit that referenced this pull request Jul 29, 2022
# This is the 1st commit message:

Add maven and RPM building in blazar

This uses our standard buildpack, but each module must get a custom .blazar.yaml to pass in required
properties to the build. One can distribute that .blazar.yaml using build-scripts/copy_blazar_yaml.sh.
In order to minimize the duplication, most of the customizations are consolidated in
build-scripts/prepare_environment.sh.

The RPM build is hooked into the standard build hbase-assembly, as a post-build step. The RPM build
scripts in hbase-assembly/rpm-build handle turning the assembled tar.gz into multiple RPMs. We required
some minor changes to the descriptor in hbase-assembly to account for the fact that our build processes
each module independently instead of as a single reactor build. As a result, moduleSet does not work, so
moduleSet usages were converted to dependencySet.

# This is the commit message #2:

Fixes to get HubSpot build to work

- Our branch version munging script set-maven-versions can't parse the pom.xml due to unicode, remove it.
- Our build adds build.json files to the jars. Allowlist those files in jar content verification.

We could potentially try to upstream generic versions changes of these at some point

# This is the commit message #3:

Add client bundles for hbase2 (#11)

* Add hubspot client bundles

* add cdh5 mode and build the client bundles using cdh5 hadoop and java8 for now

# This is the commit message #4:

Add AggregationClient to client bundle (#12)


# This is the commit message #5:

Shade hadoop compat classes so they can be loaded in hadoop jobs (#13)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants