Skip to content

Commit 2017e43

Browse files
chesnokofftimoninmaximmaksaska
authored
IGNITE-25534 Ignite accepts joining node with rolling upgrade version (#12301)
Co-authored-by: Maksim Timonin <[email protected]> Co-authored-by: Maksim Davydov <[email protected]>
1 parent 8d1cf53 commit 2017e43

File tree

9 files changed

+779
-121
lines changed

9 files changed

+779
-121
lines changed

modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
import org.apache.ignite.internal.processors.query.GridQueryProcessor;
6868
import org.apache.ignite.internal.processors.resource.GridResourceProcessor;
6969
import org.apache.ignite.internal.processors.rest.IgniteRestProcessor;
70+
import org.apache.ignite.internal.processors.rollingupgrade.RollingUpgradeProcessor;
7071
import org.apache.ignite.internal.processors.schedule.IgniteScheduleProcessorAdapter;
7172
import org.apache.ignite.internal.processors.security.IgniteSecurity;
7273
import org.apache.ignite.internal.processors.segmentation.GridSegmentationProcessor;
@@ -640,6 +641,13 @@ public interface GridKernalContext extends Iterable<GridComponent> {
640641
*/
641642
public PerformanceStatisticsProcessor performanceStatistics();
642643

644+
/**
645+
* Gets Rolling upgrade processor.
646+
*
647+
* @return Rolling upgrade processor.
648+
*/
649+
public RollingUpgradeProcessor rollingUpgrade();
650+
643651
/**
644652
* Executor that is in charge of processing user async continuations.
645653
*

modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
import org.apache.ignite.internal.processors.query.QueryEngine;
9292
import org.apache.ignite.internal.processors.resource.GridResourceProcessor;
9393
import org.apache.ignite.internal.processors.rest.IgniteRestProcessor;
94+
import org.apache.ignite.internal.processors.rollingupgrade.RollingUpgradeProcessor;
9495
import org.apache.ignite.internal.processors.schedule.IgniteScheduleProcessorAdapter;
9596
import org.apache.ignite.internal.processors.security.IgniteSecurity;
9697
import org.apache.ignite.internal.processors.segmentation.GridSegmentationProcessor;
@@ -362,6 +363,10 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
362363
@GridToStringExclude
363364
private PerformanceStatisticsProcessor perfStatProc;
364365

366+
/** Rolling upgrade processor. */
367+
@GridToStringExclude
368+
private RollingUpgradeProcessor rollUpProc;
369+
365370
/** */
366371
private Thread.UncaughtExceptionHandler hnd;
367372

@@ -596,6 +601,8 @@ else if (comp instanceof CacheObjectTransformerProcessor)
596601
transProc = (CacheObjectTransformerProcessor)comp;
597602
else if (comp instanceof PerformanceStatisticsProcessor)
598603
perfStatProc = (PerformanceStatisticsProcessor)comp;
604+
else if (comp instanceof RollingUpgradeProcessor)
605+
rollUpProc = (RollingUpgradeProcessor)comp;
599606
else if (comp instanceof IndexProcessor)
600607
indexProc = (IndexProcessor)comp;
601608
else if (!(comp instanceof DiscoveryNodeValidationProcessor
@@ -1105,6 +1112,11 @@ public void recoveryMode(boolean recoveryMode) {
11051112
return perfStatProc;
11061113
}
11071114

1115+
/** {@inheritDoc} */
1116+
@Override public RollingUpgradeProcessor rollingUpgrade() {
1117+
return rollUpProc;
1118+
}
1119+
11081120
/** {@inheritDoc} */
11091121
@Override public Executor getAsyncContinuationExecutor() {
11101122
return config().getAsyncContinuationExecutor() == null

modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@
146146
import org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageImpl;
147147
import org.apache.ignite.internal.processors.metric.GridMetricManager;
148148
import org.apache.ignite.internal.processors.nodevalidation.DiscoveryNodeValidationProcessor;
149-
import org.apache.ignite.internal.processors.nodevalidation.OsDiscoveryNodeValidationProcessor;
150149
import org.apache.ignite.internal.processors.odbc.ClientListenerProcessor;
151150
import org.apache.ignite.internal.processors.performancestatistics.PerformanceStatisticsProcessor;
152151
import org.apache.ignite.internal.processors.platform.PlatformNoopProcessor;
@@ -160,6 +159,7 @@
160159
import org.apache.ignite.internal.processors.resource.GridSpringResourceContext;
161160
import org.apache.ignite.internal.processors.rest.GridRestProcessor;
162161
import org.apache.ignite.internal.processors.rest.IgniteRestProcessor;
162+
import org.apache.ignite.internal.processors.rollingupgrade.RollingUpgradeProcessor;
163163
import org.apache.ignite.internal.processors.security.GridSecurityProcessor;
164164
import org.apache.ignite.internal.processors.security.IgniteSecurity;
165165
import org.apache.ignite.internal.processors.security.IgniteSecurityProcessor;
@@ -3225,7 +3225,7 @@ private static <T extends GridComponent> T createComponent(Class<T> cls, GridKer
32253225
return (T)new CacheObjectBinaryProcessorImpl(ctx);
32263226

32273227
if (cls.equals(DiscoveryNodeValidationProcessor.class))
3228-
return (T)new OsDiscoveryNodeValidationProcessor(ctx);
3228+
return (T)new RollingUpgradeProcessor(ctx);
32293229

32303230
if (cls.equals(IGridClusterStateProcessor.class))
32313231
return (T)new GridClusterStateProcessor(ctx);

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
import org.apache.ignite.internal.processors.query.GridQueryProcessor;
9191
import org.apache.ignite.internal.processors.resource.GridResourceProcessor;
9292
import org.apache.ignite.internal.processors.rest.IgniteRestProcessor;
93+
import org.apache.ignite.internal.processors.rollingupgrade.RollingUpgradeProcessor;
9394
import org.apache.ignite.internal.processors.schedule.IgniteScheduleProcessorAdapter;
9495
import org.apache.ignite.internal.processors.security.IgniteSecurity;
9596
import org.apache.ignite.internal.processors.security.NoOpIgniteSecurityProcessor;
@@ -741,6 +742,11 @@ private void setField(IgniteEx kernal, String name, Object val) throws NoSuchFie
741742
return null;
742743
}
743744

745+
/** {@inheritDoc} */
746+
@Override public RollingUpgradeProcessor rollingUpgrade() {
747+
return null;
748+
}
749+
744750
/** {@inheritDoc} */
745751
@Override public Executor getAsyncContinuationExecutor() {
746752
return null;

modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java

Lines changed: 0 additions & 73 deletions
This file was deleted.

0 commit comments

Comments
 (0)