Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
import org.apache.ignite.configuration.BinaryConfiguration;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.CollectionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.MemoryConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
Expand Down Expand Up @@ -266,6 +267,7 @@
import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_TX_AWARE_QUERIES_ENABLED;
import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_TX_SERIALIZABLE_ENABLED;
import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_USER_NAME;
import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_WAL_MODE;
import static org.apache.ignite.internal.IgniteVersionUtils.BUILD_TSTAMP_STR;
import static org.apache.ignite.internal.IgniteVersionUtils.COPYRIGHT;
import static org.apache.ignite.internal.IgniteVersionUtils.VER;
Expand Down Expand Up @@ -1651,8 +1653,12 @@ private void addDataStorageConfigurationAttributes() throws IgniteCheckedExcepti
add(ATTR_MEMORY_CONFIG, memCfg);
}

DataStorageConfiguration dsCfg = cfg.getDataStorageConfiguration();

// Save data storage configuration.
add(ATTR_DATA_STORAGE_CONFIG, ctx.marshallerContext().jdkMarshaller().marshal(cfg.getDataStorageConfiguration()));
add(ATTR_DATA_STORAGE_CONFIG, ctx.marshallerContext().jdkMarshaller().marshal(dsCfg));

ctx.addNodeAttribute(ATTR_WAL_MODE, dsCfg == null ? null : dsCfg.getWalMode().ordinal());
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,9 @@ public final class IgniteNodeAttributes {
/** Data center ID. */
public static final String ATTR_DATA_CENTER_ID = ATTR_PREFIX + ".datacenter.id";

/** WAL mode configuration. */
public static final String ATTR_WAL_MODE = ATTR_PREFIX + ".wal.mode";

/**
* Enforces singleton.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.DefaultCommunicationFailureResolver;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.WALMode;
import org.apache.ignite.events.DiscoveryEvent;
import org.apache.ignite.events.Event;
import org.apache.ignite.events.EventType;
Expand Down Expand Up @@ -176,6 +177,7 @@
import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_SECURITY_COMPATIBILITY_MODE;
import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_SHUTDOWN_POLICY;
import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_USER_NAME;
import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_WAL_MODE;
import static org.apache.ignite.internal.IgniteVersionUtils.VER;
import static org.apache.ignite.internal.events.DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT;
import static org.apache.ignite.internal.processors.metric.impl.MetricUtils.metricName;
Expand Down Expand Up @@ -1279,6 +1281,9 @@ private void checkAttributes(Iterable<ClusterNode> nodes) throws IgniteCheckedEx

Boolean locSecurityCompatibilityEnabled = locNode.attribute(ATTR_SECURITY_COMPATIBILITY_MODE);

WALMode locWalMode = locNode.attribute(ATTR_WAL_MODE) == null ? null :
WALMode.fromOrdinal(locNode.attribute(ATTR_WAL_MODE));

for (ClusterNode n : nodes) {
int rmtJvmMajVer = nodeJavaMajorVersion(n);

Expand Down Expand Up @@ -1383,6 +1388,16 @@ private void checkAttributes(Iterable<ClusterNode> nodes) throws IgniteCheckedEx
", locNodeId=" + locNode.id() + ", rmtNode=" + U.toShortString(n) + "]");
}
}

WALMode rmtWalMode = n.attribute(ATTR_WAL_MODE) == null ? null :
WALMode.fromOrdinal(n.attribute(ATTR_WAL_MODE));

if (locWalMode != null && rmtWalMode != null && locWalMode != rmtWalMode) {
throw new IgniteCheckedException("Remote node has WAL mode different from local " +
"[locId8=" + U.id8(locNode.id()) + ", locWalMode=" + locWalMode +
", rmtId8=" + U.id8(n.id()) + ", rmtWalMode=" + rmtWalMode +
", rmtAddrs=" + U.addressesAsString(n) + ", rmtNode=" + U.toShortString(n) + "]");
}
}

if (log.isDebugEnabled())
Expand Down
Loading