Skip to content

HDDS-14484. Clean up leftover references to Hadoop shaded protobuf #9659

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

Merged
adoroszlai merged 1 commit into from
Jan 23, 2026
+2 −12
Merged

HDDS-14484. Clean up leftover references to Hadoop shaded protobuf #9659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions hadoop-hdds/interface-client/dev-support/findbugsExcludeFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,4 @@
<Match>
<Package name="org.apache.hadoop.hdds.protocol.scm.proto"/>
</Match>
<Match>
<Package name="org.apache.hadoop.hdds.protocol.proto3"/>
</Match>
</FindBugsFilter>
1 change: 0 additions & 1 deletion ...ozone/common/src/main/java/org/apache/hadoop/ozone/om/ha/OMFailoverProxyProviderBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ protected T createOMProxy(InetSocketAddress omAddress) throws IOException {
Configuration hadoopConf =
LegacyHadoopConfigurationSource.asHadoopConfiguration(getConf());

// TODO: Post upgrade to Protobuf 3.x we need to use ProtobufRpcEngine2
RPC.setProtocolEngine(hadoopConf, getInterface(), ProtobufRpcEngine.class);

// Ensure we do not attempt retry on the same OM in case of exceptions
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dev-support/checks/coverage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ find hadoop-ozone/dist/target/*/share/ozone/lib -name 'hdds-*.jar' -or -name 'oz
xargs -n1 unzip -o -q -d target/coverage-classes

#Exclude some classes from the coverage
find target/coverage-classes -type d \( -name proto -or -name proto3 -or -name codegen -or -name generated -or -name v1 -or -name freon \) \
find target/coverage-classes -type d \( -name proto -or -name codegen -or -name generated -or -name v1 -or -name freon \) \
| xargs rm -rf

#generate the reports
Expand Down
6 changes: 0 additions & 6 deletions hadoop-ozone/interface-client/dev-support/findbugsExcludeFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,4 @@
<Match>
<Package name="org.apache.hadoop.ozone.security.proto"/>
</Match>
<Match>
<Package name="org.apache.hadoop.ozone.protocol.proto3"/>
</Match>
<Match>
<Package name="org.apache.hadoop.ozone.security.proto3"/>
</Match>
</FindBugsFilter>
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1718,7 +1718,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<configuration>
<excludePackageNames>org.apache.hadoop.hdds.protocol.datanode.proto:org.apache.hadoop.hdds.protocol.proto:org.apache.hadoop.hdds.protocol.proto3:org.apache.hadoop.hdds.protocol.scm.proto:org.apache.hadoop.ozone.protocol.proto:org.apache.hadoop.ozone.protocol.proto3:org.apache.hadoop.ozone.security.proto:org.apache.hadoop.ozone.security.proto3:org.apache.hadoop.ozone.storage.proto:org.apache.ozone.recon.schema.generated:org.apache.ozone.recon.schema.generated.tables</excludePackageNames>
<excludePackageNames>org.apache.hadoop.hdds.protocol.datanode.proto:org.apache.hadoop.hdds.protocol.proto:org.apache.hadoop.hdds.protocol.scm.proto:org.apache.hadoop.ozone.protocol.proto:org.apache.hadoop.ozone.security.proto:org.apache.hadoop.ozone.storage.proto:org.apache.ozone.recon.schema.generated:org.apache.ozone.recon.schema.generated.tables</excludePackageNames>
<sourceFileExcludes>
<exclude>**/package-info.java</exclude>
<exclude>**/org/apache/ozone/recon/schema/generated/tables/**/*.java</exclude>
Expand Down