You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ignite.apache.org by GitBox <gi...@apache.org> on 2022/03/28 16:08:20 UTC
[GitHub] [ignite] xtern commented on a change in pull request #9912: IGNITE-16730 Eliminate usage of FileLock in MarshallerMappingFileStore
xtern commented on a change in pull request #9912:
URL: https://github.com/apache/ignite/pull/9912#discussion_r836577226
##########
File path: modules/core/src/main/java/org/apache/ignite/internal/MarshallerMappingFileStore.java
##########
@@ -88,48 +87,48 @@
* @param typeId Type id.
* @param typeName Type name.
*/
- void writeMapping(byte platformId, int typeId, String typeName) {
+ public void writeMapping(byte platformId, int typeId, String typeName) {
String fileName = getFileName(platformId, typeId);
+ File tmpFile = new File(mappingDir, fileName + ThreadLocalRandom.current().nextInt() + ".tmp");
+ File file = new File(mappingDir, fileName);
+
Lock lock = fileLock(fileName);
lock.lock();
try {
- File file = new File(mappingDir, fileName);
-
- try (FileOutputStream out = new FileOutputStream(file)) {
+ try (FileOutputStream out = new FileOutputStream(tmpFile)) {
try (Writer writer = new OutputStreamWriter(out, StandardCharsets.UTF_8)) {
- try (FileLock ignored = fileLock(out.getChannel(), false)) {
- writer.write(typeName);
+ writer.write(typeName);
- writer.flush();
- }
+ writer.flush();
}
}
- catch (IOException e) {
- U.error(log, "Failed to write class name to file [platformId=" + platformId + "id=" + typeId +
- ", clsName=" + typeName + ", file=" + file.getAbsolutePath() + ']', e);
- }
- catch (OverlappingFileLockException ignored) {
- if (log.isDebugEnabled())
- log.debug("File already locked (will ignore): " + file.getAbsolutePath());
- }
- catch (IgniteInterruptedCheckedException e) {
- U.error(log, "Interrupted while waiting for acquiring file lock: " + file, e);
- }
+
+ Files.move(tmpFile.toPath(), file.toPath(), REPLACE_EXISTING, ATOMIC_MOVE);
+ }
+ catch (IOException e) {
+ U.error(log, "Failed to write class name to file [platformId=" + platformId + "id=" + typeId +
Review comment:
```suggestion
U.error(log, "Failed to write class name to file [platformId=" + platformId + ", id=" + typeId +
```
##########
File path: modules/core/src/main/java/org/apache/ignite/internal/MarshallerMappingFileStore.java
##########
@@ -139,43 +138,24 @@ private String readMapping(String fileName) throws IgniteCheckedException {
long time = 0;
Review comment:
`time` + `FILE_LOCK_TIMEOUT_MS` is no longer used and can be removed.
##########
File path: modules/core/src/test/java/org/apache/ignite/internal/ConcurrentMappingFileReadWriteTest.java
##########
@@ -0,0 +1,109 @@
+/*
+ * 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.ignite.internal;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.binary.BinaryBasicIdMapper;
+import org.apache.ignite.internal.processors.cache.persistence.wal.reader.StandaloneGridKernalContext;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.configuration.DataStorageConfiguration.DFLT_MARSHALLER_PATH;
+
+/**
+ * Tests concurrent read/write operations for {@code org.apache.ignite.internal.MarshallerMappingFileStore}
Review comment:
```suggestion
* Tests concurrent read/write operations for {@code org.apache.ignite.internal.MarshallerMappingFileStore}.
```
##########
File path: modules/core/src/test/java/org/apache/ignite/internal/ConcurrentMappingFileReadWriteTest.java
##########
@@ -0,0 +1,109 @@
+/*
+ * 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.ignite.internal;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.binary.BinaryBasicIdMapper;
+import org.apache.ignite.internal.processors.cache.persistence.wal.reader.StandaloneGridKernalContext;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.configuration.DataStorageConfiguration.DFLT_MARSHALLER_PATH;
+
+/**
+ * Tests concurrent read/write operations for {@code org.apache.ignite.internal.MarshallerMappingFileStore}
+ */
+public class ConcurrentMappingFileReadWriteTest extends GridCommonAbstractTest {
+ /** */
+ private static final byte PLATFORM_ID = (byte)0;
+
+ /** */
+ private static final int TYPE_ID = new BinaryBasicIdMapper().typeId(String.class.getName());
+
+ /** */
+ private File mappingDir;
+
+ /** */
+ private MarshallerMappingFileStore mappingFileStore;
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ mappingDir = new File(U.workDirectory(null, null) + DFLT_MARSHALLER_PATH);
+ mappingDir.mkdirs();
+
+ mappingFileStore = new MarshallerMappingFileStore(
+ new StandaloneGridKernalContext(log, null, null),
+ mappingDir
+ );
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ U.delete(mappingDir);
+ }
+
+ /** */
+ @Test
+ public void testConcurrentMappingReadWrite() throws Exception {
+ CountDownLatch latch = new CountDownLatch(1);
+
+ IgniteInternalFuture<?> fut = multithreadedAsync(() -> {
+ try {
+ assertTrue(latch.await(getTestTimeout(), MILLISECONDS));
Review comment:
The latch here does not guarantee that all threads will be at that point at the time `countDown()` is called. I suggest replacing it with a `CyclicBarrier(threadsCnt)`.
--
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: notifications-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org