This is an automated email from the ASF dual-hosted git repository.
danny0405 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hudi.git
The following commit(s) were added to refs/heads/master by this push:
new 704ccb24b76 [MINOR] Add test case validating metaclient reload (#12403)
704ccb24b76 is described below
commit 704ccb24b76e02ecde518bd2e4e33880855f7793
Author: Tim Brown <[email protected]>
AuthorDate: Tue Dec 17 02:20:12 2024 -0600
[MINOR] Add test case validating metaclient reload (#12403)
---
.../hudi/client/utils/TestTransactionUtils.java | 88 ++++++++++++++++++++++
1 file changed, 88 insertions(+)
diff --git
a/hudi-client/hudi-client-common/src/test/java/org/apache/hudi/client/utils/TestTransactionUtils.java
b/hudi-client/hudi-client-common/src/test/java/org/apache/hudi/client/utils/TestTransactionUtils.java
new file mode 100644
index 00000000000..0dad70501a5
--- /dev/null
+++
b/hudi-client/hudi-client-common/src/test/java/org/apache/hudi/client/utils/TestTransactionUtils.java
@@ -0,0 +1,88 @@
+/*
+ * 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.
+ */
+
+package org.apache.hudi.client.utils;
+
+import org.apache.hudi.common.model.HoodieCommitMetadata;
+import org.apache.hudi.common.table.HoodieTableMetaClient;
+import org.apache.hudi.common.table.timeline.HoodieActiveTimeline;
+import org.apache.hudi.common.table.timeline.HoodieInstant;
+import org.apache.hudi.common.table.timeline.HoodieTimeline;
+import org.apache.hudi.common.testutils.HoodieCommonTestHarness;
+import org.apache.hudi.common.testutils.HoodieTestTable;
+import org.apache.hudi.common.util.Option;
+import org.apache.hudi.config.HoodieWriteConfig;
+import org.apache.hudi.exception.HoodieWriteConflictException;
+import org.apache.hudi.table.HoodieTable;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.io.IOException;
+import java.util.Collections;
+
+import static
org.apache.hudi.client.transaction.TestConflictResolutionStrategyUtil.createCommit;
+import static
org.apache.hudi.client.transaction.TestConflictResolutionStrategyUtil.createCommitMetadata;
+import static
org.apache.hudi.client.transaction.TestConflictResolutionStrategyUtil.createInflightCommit;
+import static
org.apache.hudi.common.model.WriteConcurrencyMode.OPTIMISTIC_CONCURRENCY_CONTROL;
+import static
org.apache.hudi.common.testutils.HoodieTestUtils.INSTANT_GENERATOR;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class TestTransactionUtils extends HoodieCommonTestHarness {
+ @BeforeEach
+ void init() throws IOException {
+ initMetaClient();
+ }
+
+ @ParameterizedTest
+ @ValueSource(booleans = {false, true})
+ void resolveWriteConflictIfAnyThrowsExceptionIfConflict(boolean
timelineRefreshedWithinTransaction) throws Exception {
+ createCommit(HoodieTestTable.makeNewCommitTime(), metaClient);
+ HoodieActiveTimeline timeline = metaClient.getActiveTimeline();
+ // consider commits before this are all successful
+ Option<HoodieInstant> lastSuccessfulInstant =
timeline.getCommitsTimeline().filterCompletedInstants().lastInstant();
+ // writer 1 starts
+ String currentWriterInstant = HoodieTestTable.makeNewCommitTime();
+ createInflightCommit(currentWriterInstant, metaClient);
+ // writer 2 starts and finishes
+ String newInstantTime = HoodieTestTable.makeNewCommitTime();
+ createCommit(newInstantTime, metaClient);
+
+ Option<HoodieInstant> currentInstant =
Option.of(INSTANT_GENERATOR.createNewInstant(HoodieInstant.State.INFLIGHT,
HoodieTimeline.COMMIT_ACTION, currentWriterInstant));
+ HoodieCommitMetadata currentMetadata =
createCommitMetadata(currentWriterInstant, "file-1");
+
+ HoodieWriteConfig writeConfig = HoodieWriteConfig.newBuilder()
+ .withPath(metaClient.getBasePath().toString())
+ .withWriteConcurrencyMode(OPTIMISTIC_CONCURRENCY_CONTROL)
+ .build();
+ metaClient.reloadActiveTimeline();
+ HoodieTable table = mock(HoodieTable.class);
+ HoodieTableMetaClient spyMetaClient = spy(metaClient);
+ when(table.getMetaClient()).thenReturn(spyMetaClient);
+ assertThrows(HoodieWriteConflictException.class,
+ () -> TransactionUtils.resolveWriteConflictIfAny(table,
currentInstant, Option.of(currentMetadata), writeConfig,
+ lastSuccessfulInstant, timelineRefreshedWithinTransaction,
Collections.singleton(newInstantTime)));
+ verify(spyMetaClient, times(timelineRefreshedWithinTransaction ? 0 :
1)).reloadActiveTimeline();
+ }
+}
