ivandika3 commented on code in PR #11056:
URL: https://github.com/apache/ozone/pull/11056#discussion_r3945984919
##########
hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconContainerMetadataManagerImpl.java:
##########
@@ -416,6 +437,54 @@ public void testGetContainersWithPrevContainer() throws
Exception {
assertEquals(0, containerMap.size());
}
+ @Test
+ public void testGetContainersIncludesUniquePipelines() throws Exception {
+ long containerId = 1L;
+ Pipeline pipeline1 = OMMetadataManagerTestUtils.getRandomPipeline();
+ Pipeline pipeline2 = OMMetadataManagerTestUtils.getRandomPipeline();
+
+ String key1 = "key1";
+ String key2 = "key2";
+ List<OmKeyLocationInfo> key1Locations = new ArrayList<>();
+ key1Locations.add(OMMetadataManagerTestUtils.getOmKeyLocationInfo(
+ new BlockID(containerId, 1), pipeline1));
+ List<OmKeyLocationInfo> key2Locations = new ArrayList<>();
+ key2Locations.add(OMMetadataManagerTestUtils.getOmKeyLocationInfo(
+ new BlockID(containerId, 2), pipeline1));
+ key2Locations.add(OMMetadataManagerTestUtils.getOmKeyLocationInfo(
+ new BlockID(containerId, 3), pipeline2));
+
+ ReconOMMetadataManager omMetadataManager =
mock(ReconOMMetadataManager.class);
+ Table<String, OmKeyInfo> keyTable = mock(Table.class);
+
when(omMetadataManager.getKeyTable(BucketLayout.LEGACY)).thenReturn(keyTable);
+ when(keyTable.getSkipCache(key1)).thenReturn(new OmKeyInfo.Builder()
Review Comment:
Good catch. The mocked getSkipCache() bypassed OM metadata serialization.
Persisted OmKeyInfo omits pipeline information, so a real table cannot supply
pipelines on this path. I reverted the pipeline population change and its
mock-only test rather than asserting behavior that does not exist in production.
##########
hadoop-ozone/dev-support/checks/errorprone.sh:
##########
@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+
+#checks:basic
+
+set -u -o pipefail
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+cd "$DIR/../../.." || exit 1
+
+REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../../target/errorprone"}
+REPORT_FILE="$REPORT_DIR/summary.txt"
+DIAGNOSTIC_FILE="$REPORT_DIR/diagnostics.txt"
+OUTPUT_LOG=$(mktemp)
+
+MAVEN_OPTIONS='-B -fae --no-transfer-progress -Perrorprone -DskipDocs
-DskipRecon -DskipShade'
Review Comment:
Addressed. The check no longer sets -DskipShade, so the build-with-ozonefs
profile includes both OzoneFS compatibility modules. The excluded-path regex
now keeps ozonefs-hadoop2/target/generated-sources/java in scope while
continuing to exclude other generated sources.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
