This is an automated email from the ASF dual-hosted git repository.
agoncharuk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 95c616c IGNITE-9120 Metadata writer should propagate error to failure
handler - Fixes #5673.
95c616c is described below
commit 95c616ccb14e687d9e27b04a3b97e24e8db6b083
Author: a-polyakov <polyakov.alexandr.alexandrov...@gmail.com>
AuthorDate: Fri Jan 11 17:14:24 2019 +0300
IGNITE-9120 Metadata writer should propagate error to failure handler -
Fixes #5673.
Signed-off-by: Alexey Goncharuk <alexey.goncha...@gmail.com>
---
.../cache/binary/BinaryMetadataFileStore.java | 33 ++++-
.../IgnitePdsNoSpaceLeftOnDeviceTest.java | 154 +++++++++++++++++++++
2 files changed, 180 insertions(+), 7 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataFileStore.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataFileStore.java
index 662839c..bee4099 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataFileStore.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataFileStore.java
@@ -18,13 +18,17 @@ package org.apache.ignite.internal.processors.cache.binary;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.util.concurrent.ConcurrentMap;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.failure.FailureContext;
+import org.apache.ignite.failure.FailureType;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.binary.BinaryMetadata;
import org.apache.ignite.internal.binary.BinaryUtils;
+import org.apache.ignite.internal.processors.cache.persistence.file.FileIO;
+import
org.apache.ignite.internal.processors.cache.persistence.file.FileIOFactory;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.jetbrains.annotations.Nullable;
@@ -46,6 +50,9 @@ class BinaryMetadataFileStore {
private final GridKernalContext ctx;
/** */
+ private FileIOFactory fileIOFactory;
+
+ /** */
private final IgniteLogger log;
/**
@@ -67,6 +74,8 @@ class BinaryMetadataFileStore {
if (!CU.isPersistenceEnabled(ctx.config()))
return;
+ fileIOFactory =
ctx.config().getDataStorageConfiguration().getFileIOFactory();
+
if (binaryMetadataFileStoreDir != null)
workDir = binaryMetadataFileStoreDir;
else {
@@ -91,17 +100,27 @@ class BinaryMetadataFileStore {
return;
try {
- File file = new File(workDir, Integer.toString(binMeta.typeId()) +
".bin");
+ File file = new File(workDir, binMeta.typeId() + ".bin");
+
+ byte[] marshalled = U.marshal(ctx, binMeta);
- try(FileOutputStream out = new FileOutputStream(file, false)) {
- byte[] marshalled = U.marshal(ctx, binMeta);
+ try (final FileIO out = fileIOFactory.create(file)) {
+ int left = marshalled.length;
+ while ((left -= out.writeFully(marshalled, 0,
Math.min(marshalled.length, left))) > 0)
+ ;
- out.write(marshalled);
+ out.force();
}
}
catch (Exception e) {
- U.warn(log, "Failed to save metadata for typeId: " +
binMeta.typeId() +
- "; exception was thrown: " + e.getMessage());
+ final String msg = "Failed to save metadata for typeId: " +
binMeta.typeId() +
+ "; exception was thrown: " + e.getMessage();
+
+ U.error(log, msg);
+
+ ctx.failure().process(new
FailureContext(FailureType.CRITICAL_ERROR, e));
+
+ throw new IgniteException(msg, e);
}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsNoSpaceLeftOnDeviceTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsNoSpaceLeftOnDeviceTest.java
new file mode 100644
index 0000000..d53a344
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsNoSpaceLeftOnDeviceTest.java
@@ -0,0 +1,154 @@
+/*
+ * 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.processors.cache.persistence;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.OpenOption;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.DataStorageConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.failure.StopNodeFailureHandler;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.processors.cache.persistence.file.FileIO;
+import
org.apache.ignite.internal.processors.cache.persistence.file.FileIOFactory;
+import
org.apache.ignite.internal.processors.cache.persistence.file.RandomAccessFileIOFactory;
+import
org.apache.ignite.internal.processors.cache.persistence.wal.reader.StandaloneGridKernalContext;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.Transaction;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/**
+ *
+ */
+@RunWith(JUnit4.class)
+public class IgnitePdsNoSpaceLeftOnDeviceTest extends GridCommonAbstractTest {
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ final DataStorageConfiguration dataStorageConfiguration = new
DataStorageConfiguration();
+
+
dataStorageConfiguration.getDefaultDataRegionConfiguration().setPersistenceEnabled(true).setMaxSize(1
<< 24);
+ dataStorageConfiguration.setFileIOFactory(new FailingFileIOFactory());
+
+ cfg.setDataStorageConfiguration(dataStorageConfiguration);
+
+ CacheConfiguration ccfg = new CacheConfiguration();
+
+ ccfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
+ ccfg.setName(DEFAULT_CACHE_NAME);
+ ccfg.setBackups(1);
+
+ cfg.setCacheConfiguration(ccfg);
+
+ cfg.setFailureHandler(new StopNodeFailureHandler());
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ cleanPersistenceDir();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ stopAllGrids();
+
+ cleanPersistenceDir();
+ }
+
+ /**
+ * The tests to validate <a
href="https://issues.apache.org/jira/browse/IGNITE-9120";>IGNITE-9120</a>
+ * Metadata writer does not propagate error to failure handler.
+ *
+ * @throws Exception If failed.
+ */
+ @Test
+ public void testWhileWritingBinaryMetadataFile() throws Exception {
+ final IgniteEx ignite0 = startGrid(0);
+
+ final IgniteEx ignite1 = startGrid(1);
+
+
FailingFileIOFactory.setUnluckyConsistentId(ignite1.localNode().consistentId().toString());
+
+ ignite0.cluster().active(true);
+
+ final IgniteCache cache = ignite0.cache(DEFAULT_CACHE_NAME);
+
+ for (int i = 0; i < 30; i++) {
+ try (Transaction tx = ignite0.transactions().txStart()) {
+ cache.put(1,
ignite0.binary().builder("test").setField("field1", i).build());
+
+ cache.put(1 << i,
ignite0.binary().builder("test").setField("field1", i).build());
+
+ tx.commit();
+ }
+ catch (Exception e) {
+ }
+ }
+
+ waitForTopology(1);
+ }
+
+ /**
+ * Generating error "No space left on device" when writing binary_meta
file on the second node
+ */
+ private static class FailingFileIOFactory implements FileIOFactory {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 0L;
+
+ /**
+ *
+ */
+ private final FileIOFactory delegateFactory = new
RandomAccessFileIOFactory();
+
+ /**
+ * Node ConsistentId for which the error will be generated
+ */
+ private static final AtomicReference<String> unluckyConsistentId = new
AtomicReference<>();
+
+ /** {@inheritDoc} */
+ @Override public FileIO create(File file, OpenOption... modes) throws
IOException {
+ if (unluckyConsistentId.get() != null
+ && file.getAbsolutePath().contains(unluckyConsistentId.get())
+ &&
file.getAbsolutePath().contains(StandaloneGridKernalContext.BINARY_META_FOLDER))
+ throw new IOException("No space left on device");
+
+ return delegateFactory.create(file, modes);
+ }
+
+ /**
+ * Set node ConsistentId for which the error will be generated
+ *
+ * @param unluckyConsistentId Node ConsistentId.
+ */
+ public static void setUnluckyConsistentId(String unluckyConsistentId) {
+ FailingFileIOFactory.unluckyConsistentId.set(unluckyConsistentId);
+ }
+ }
+}
