Skip to content

IGNITE-28038 Use MessageSerializer for continuous stop discovery messages #12847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chesnokoff wants to merge 1 commit into
base: master
Choose a base branch
from
Open

IGNITE-28038 Use MessageSerializer for continuous stop discovery messages #12847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions .../src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
import org.apache.ignite.internal.processors.cache.binary.MetadataRemoveAcceptedMessageSerializer;
import org.apache.ignite.internal.processors.cache.binary.MetadataRemoveProposedMessage;
import org.apache.ignite.internal.processors.cache.binary.MetadataRemoveProposedMessageSerializer;
import org.apache.ignite.internal.processors.continuous.StopRoutineAckDiscoveryMessage;
import org.apache.ignite.internal.processors.continuous.StopRoutineAckDiscoveryMessageSerializer;
import org.apache.ignite.internal.processors.continuous.StopRoutineDiscoveryMessage;
import org.apache.ignite.internal.processors.continuous.StopRoutineDiscoveryMessageSerializer;
import org.apache.ignite.plugin.extensions.communication.MessageFactory;
import org.apache.ignite.plugin.extensions.communication.MessageFactoryProvider;
import org.apache.ignite.spi.discovery.tcp.internal.DiscoveryDataPacket;
Expand Down Expand Up @@ -133,5 +137,7 @@ public class DiscoveryMessageFactory implements MessageFactoryProvider {
factory.register((short)501, SecurityAwareCustomMessageWrapper::new, new SecurityAwareCustomMessageWrapperSerializer());
factory.register((short)502, MetadataRemoveAcceptedMessage::new, new MetadataRemoveAcceptedMessageSerializer());
factory.register((short)503, MetadataRemoveProposedMessage::new, new MetadataRemoveProposedMessageSerializer());
factory.register((short)504, StopRoutineAckDiscoveryMessage::new, new StopRoutineAckDiscoveryMessageSerializer());
factory.register((short)505, StopRoutineDiscoveryMessage::new, new StopRoutineDiscoveryMessageSerializer());
}
}
13 changes: 11 additions & 2 deletions ...main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.continuous;

import java.util.UUID;
import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.managers.discovery.DiscoCache;
import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
Expand All @@ -33,15 +34,23 @@ public abstract class AbstractContinuousMessage implements DiscoveryCustomMessag
private static final long serialVersionUID = 2781778657738703012L;

/** Routine ID. */
protected final UUID routineId;
@Order(0)
UUID routineId;

/** Custom message ID. */
private final IgniteUuid id = IgniteUuid.randomUuid();
@Order(1)
IgniteUuid id;

/** */
protected AbstractContinuousMessage() {
// No-op.
}

/**
* @param id Id.
*/
protected AbstractContinuousMessage(UUID id) {
this.id = IgniteUuid.randomUuid();
routineId = id;
}

Expand Down
13 changes: 12 additions & 1 deletion ...java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,21 @@
import java.util.UUID;
import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.plugin.extensions.communication.Message;
import org.jetbrains.annotations.Nullable;

/**
*
*/
public class StopRoutineAckDiscoveryMessage extends AbstractContinuousMessage {
public class StopRoutineAckDiscoveryMessage extends AbstractContinuousMessage implements Message {
/** */
private static final long serialVersionUID = 0L;

/** */
public StopRoutineAckDiscoveryMessage() {
// No-op.
}

/**
* @param routineId Routine id.
*/
Expand All @@ -45,4 +51,9 @@ public StopRoutineAckDiscoveryMessage(UUID routineId) {
@Override public String toString() {
return S.toString(StopRoutineAckDiscoveryMessage.class, this, "routineId", routineId());
}

/** {@inheritDoc} */
@Override public short directType() {
return 504;
}
}
13 changes: 12 additions & 1 deletion ...in/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,21 @@
import java.util.UUID;
import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.plugin.extensions.communication.Message;
import org.jetbrains.annotations.Nullable;

/**
*
*/
public class StopRoutineDiscoveryMessage extends AbstractContinuousMessage {
public class StopRoutineDiscoveryMessage extends AbstractContinuousMessage implements Message {
/** */
private static final long serialVersionUID = 0L;

/** */
public StopRoutineDiscoveryMessage() {
// No-op.
}

/**
* @param routineId Routine id.
*/
Expand All @@ -45,4 +51,9 @@ public StopRoutineDiscoveryMessage(UUID routineId) {
@Override public String toString() {
return S.toString(StopRoutineDiscoveryMessage.class, this, "routineId", routineId());
}

/** {@inheritDoc} */
@Override public short directType() {
return 505;
}
}