JoegenUSTC commented on code in PR #11846: URL: https://github.com/apache/gravitino/pull/11846#discussion_r3569315845
########## core/src/test/java/org/apache/gravitino/catalog/TestCatalogWrapperConcurrency.java: ########## @@ -0,0 +1,207 @@ +/* + * 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.gravitino.catalog; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; +import org.apache.gravitino.connector.BaseCatalog; +import org.apache.gravitino.connector.capability.Capability; +import org.apache.gravitino.utils.IsolatedClassLoader; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +/** + * Verifies that {@link CatalogManager.CatalogWrapper} correctly serializes {@code close()} against + * in-flight {@code doWithCapabilityOps()} calls via {@code synchronized}, preventing the {@link + * IsolatedClassLoader} from being torn down while a capability operation is still executing. + */ +public class TestCatalogWrapperConcurrency { + + /** + * close() must block until a concurrent doWithCapabilityOps() call finishes (both methods are + * synchronized on the same monitor), and subsequent doWithCapabilityOps() calls after close() + * must throw IllegalStateException. + */ + @Test + public void testCloseBlocksUntilInFlightCapabilityOpsComplete() throws Exception { + BaseCatalog mockCatalog = Mockito.mock(BaseCatalog.class); + Mockito.when(mockCatalog.capability()).thenReturn(Capability.DEFAULT); + + IsolatedClassLoader mockCl = Mockito.mock(IsolatedClassLoader.class); + Mockito.when(mockCl.withClassLoader(Mockito.any())) + .thenAnswer( + inv -> + ((org.apache.gravitino.utils.ThrowableFunction<ClassLoader, ?>) inv.getArgument(0)) + .apply(Thread.currentThread().getContextClassLoader())); + + CatalogManager.CatalogWrapper wrapper = new CatalogManager.CatalogWrapper(mockCatalog, mockCl); + + CountDownLatch opStarted = new CountDownLatch(1); + CountDownLatch permitClose = new CountDownLatch(1); + AtomicInteger opCompleted = new AtomicInteger(0); + + ExecutorService exec = Executors.newFixedThreadPool(2); + try { + // One in-flight capability op that holds the synchronized lock while waiting. + Callable<Void> op = + () -> { + wrapper.doWithCapabilityOps( + cap -> { + opStarted.countDown(); + permitClose.await(5, TimeUnit.SECONDS); + opCompleted.incrementAndGet(); + return null; + }); + return null; + }; + + Future<Void> f1 = exec.submit(op); + + // Wait for the op to acquire the synchronized lock. + Assertions.assertTrue(opStarted.await(5, TimeUnit.SECONDS)); + + // Start close() on a separate thread; it must block waiting for the op to release the lock. + Future<Void> closeFuture = + exec.submit( + () -> { + wrapper.close(); + return null; + }); + + // Give close() a moment to attempt acquiring the lock, then verify it is still blocked. + Thread.sleep(100); + Assertions.assertFalse( + closeFuture.isDone(), "close() must not complete while op holds the lock"); Review Comment: Replaced with a bounded spin-wait loop: long deadline = System.nanoTime() + TimeUnit.MILLISECONDS.toNanos(200); while (!closeFuture.isDone() && System.nanoTime() < deadline) { Thread.yield(); } This avoids calendar-time sensitivity while still asserting that close() is blocked. -- 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]
