ignite git commit: IGNITE-8989 Web Console: Fixed defaults for clientConnectorConfiguration.
Repository: ignite
Updated Branches:
refs/heads/master b718e4438 -> 83ee6d3cd
IGNITE-8989 Web Console: Fixed defaults for clientConnectorConfiguration.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/83ee6d3c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/83ee6d3c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/83ee6d3c
Branch: refs/heads/master
Commit: 83ee6d3cd196127eeae3ae69cc0c586a87f95ca5
Parents: b718e44
Author: Vasiliy Sisko
Authored: Fri Aug 3 00:37:39 2018 +0700
Committer: Alexey Kuznetsov
Committed: Fri Aug 3 00:37:39 2018 +0700
--
modules/web-console/frontend/app/services/Clusters.js | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/83ee6d3c/modules/web-console/frontend/app/services/Clusters.js
--
diff --git a/modules/web-console/frontend/app/services/Clusters.js
b/modules/web-console/frontend/app/services/Clusters.js
index c33c145..0228a77 100644
--- a/modules/web-console/frontend/app/services/Clusters.js
+++ b/modules/web-console/frontend/app/services/Clusters.js
@@ -188,7 +188,11 @@ export default class Clusters {
tcpNoDelay: true
},
clientConnectorConfiguration: {
-tcpNoDelay: true
+tcpNoDelay: true,
+jdbcEnabled: true,
+odbcEnabled: true,
+thinClientEnabled: true,
+useIgniteSslContextFactory: true
},
space: void 0,
discovery: {
ignite git commit: IGNITE-8869 PartitionsExchangeOnDiscoveryHistoryOverflowTest hangs on TeamCity. - Fixes #4277.
Repository: ignite
Updated Branches:
refs/heads/master 24bd54a7c -> b718e4438
IGNITE-8869 PartitionsExchangeOnDiscoveryHistoryOverflowTest hangs on TeamCity.
- Fixes #4277.
Signed-off-by: Dmitriy Pavlov
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b718e443
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b718e443
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b718e443
Branch: refs/heads/master
Commit: b718e4438e469ad0341f1bf9a605c2fe3ab5970c
Parents: 24bd54a
Author: Ivan Daschinskiy
Authored: Thu Aug 2 18:57:22 2018 +0300
Committer: Dmitriy Pavlov
Committed: Thu Aug 2 18:57:22 2018 +0300
--
.../dht/preloader/latch/ExchangeLatchManager.java | 12 ++--
...artitionsExchangeOnDiscoveryHistoryOverflowTest.java | 2 --
2 files changed, 6 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/b718e443/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java
index 8a57b90..0798d33 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java
@@ -38,13 +38,13 @@ import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.GridTopic;
import org.apache.ignite.internal.managers.communication.GridIoManager;
import org.apache.ignite.internal.managers.communication.GridIoPolicy;
-import org.apache.ignite.internal.managers.discovery.DiscoCache;
import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.util.GridConcurrentHashSet;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.lang.IgniteProductVersion;
import org.jetbrains.annotations.Nullable;
@@ -228,13 +228,13 @@ public class ExchangeLatchManager {
if (topVer == AffinityTopologyVersion.NONE)
return discovery.aliveServerNodes();
else {
-DiscoCache discoCache = discovery.discoCache(topVer);
+Collection histNodes =
discovery.topology(topVer.topologyVersion());
-if (discoCache != null)
-return discoCache.aliveServerNodes();
+if (histNodes != null)
+return histNodes.stream().filter(n -> !CU.clientNode(n) &&
!n.isDaemon() && discovery.alive(n))
+.collect(Collectors.toList());
else
-throw new IgniteException("DiscoCache not found for topology "
-+ topVer
+throw new IgniteException("Topology " + topVer + " not found
in discovery history "
+ "; consider increasing IGNITE_DISCOVERY_HISTORY_SIZE
property. Current value is "
+
IgniteSystemProperties.getInteger(IgniteSystemProperties.IGNITE_DISCOVERY_HISTORY_SIZE,
-1));
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b718e443/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeOnDiscoveryHistoryOverflowTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeOnDiscoveryHistoryOverflowTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeOnDiscoveryHistoryOverflowTest.java
index f9d6bf0..c0896c8 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeOnDiscoveryHistoryOverflowTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeOnDiscoveryHistoryOverflowTest.java
@@ -122,8 +122,6 @@ public class
PartitionsExchangeOnDiscoveryHistoryOverflowTest extends IgniteCach
* @throws Exception In case of error.
*/
public void testDynamicCacheCreation() throws Exception {
-
ignite git commit: IGNITE-9073 Use jackson2 dependency instead of jackson1 and remove unused dependencies - Fixes #4444.
Repository: ignite
Updated Branches:
refs/heads/master 10b591449 -> 24bd54a7c
IGNITE-9073 Use jackson2 dependency instead of jackson1 and remove unused
dependencies - Fixes #.
Signed-off-by: Dmitriy Pavlov
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/24bd54a7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/24bd54a7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/24bd54a7
Branch: refs/heads/master
Commit: 24bd54a7c38a0f1e73dbfc32bf33914c76c19d9e
Parents: 10b5914
Author: zzzadruga
Authored: Thu Aug 2 18:20:02 2018 +0300
Committer: Dmitriy Pavlov
Committed: Thu Aug 2 18:20:02 2018 +0300
--
.../src/test/config/aop/aspectj/META-INF/aop.xml | 4 ++--
modules/aws/pom.xml | 18 --
modules/gce/pom.xml | 2 +-
modules/kubernetes/pom.xml| 8
.../TcpDiscoveryKubernetesIpFinder.java | 4 ++--
.../osgi-karaf/src/main/resources/features.xml| 10 +-
modules/rest-http/pom.xml | 6 +++---
modules/spark/pom.xml | 6 --
modules/web-console/web-agent/pom.xml | 2 +-
modules/zookeeper/pom.xml | 10 ++
.../zk/TcpDiscoveryZookeeperIpFinder.java | 2 +-
parent/pom.xml| 3 +--
12 files changed, 22 insertions(+), 53 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/24bd54a7/modules/aop/src/test/config/aop/aspectj/META-INF/aop.xml
--
diff --git a/modules/aop/src/test/config/aop/aspectj/META-INF/aop.xml
b/modules/aop/src/test/config/aop/aspectj/META-INF/aop.xml
index 79417da..8741bd1 100644
--- a/modules/aop/src/test/config/aop/aspectj/META-INF/aop.xml
+++ b/modules/aop/src/test/config/aop/aspectj/META-INF/aop.xml
@@ -139,7 +139,7 @@
-
+
@@ -285,7 +285,7 @@
-
+
http://git-wip-us.apache.org/repos/asf/ignite/blob/24bd54a7/modules/aws/pom.xml
--
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index 914d864..e50b6df 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -72,24 +72,6 @@
-com.fasterxml.jackson.core
-jackson-core
-${jackson2.version}
-
-
-
-com.fasterxml.jackson.core
-jackson-annotations
-${jackson2.version}
-
-
-
-com.fasterxml.jackson.core
-jackson-databind
-${jackson2.version}
-
-
-
joda-time
joda-time
2.8.1
http://git-wip-us.apache.org/repos/asf/ignite/blob/24bd54a7/modules/gce/pom.xml
--
diff --git a/modules/gce/pom.xml b/modules/gce/pom.xml
index a8b9e4d..7b66c2a 100644
--- a/modules/gce/pom.xml
+++ b/modules/gce/pom.xml
@@ -62,7 +62,7 @@
com.fasterxml.jackson.core
jackson-core
-${jackson2.version}
+${jackson.version}
http://git-wip-us.apache.org/repos/asf/ignite/blob/24bd54a7/modules/kubernetes/pom.xml
--
diff --git a/modules/kubernetes/pom.xml b/modules/kubernetes/pom.xml
index f23c479..83fafd0 100644
--- a/modules/kubernetes/pom.xml
+++ b/modules/kubernetes/pom.xml
@@ -42,14 +42,14 @@
-org.codehaus.jackson
-jackson-core-asl
+com.fasterxml.jackson.core
+jackson-core
${jackson.version}
-org.codehaus.jackson
-jackson-mapper-asl
+com.fasterxml.jackson.core
+jackson-databind
${jackson.version}
http://git-wip-us.apache.org/repos/asf/ignite/blob/24bd54a7/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java
--
diff --git
a/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java
b/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java
index 53b6df6..51b68df 100644
---
a/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java
+++
ignite git commit: Reference from github readme page to TeamCity tests was updated.
Repository: ignite Updated Branches: refs/heads/master 0e9bb1c0e -> 10b591449 Reference from github readme page to TeamCity tests was updated. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/10b59144 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/10b59144 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/10b59144 Branch: refs/heads/master Commit: 10b591449eac443322cba60d7b84eb151cadb79b Parents: 0e9bb1c Author: Dmitriy Pavlov Authored: Thu Aug 2 18:03:54 2018 +0300 Committer: Dmitriy Pavlov Committed: Thu Aug 2 18:04:21 2018 +0300 -- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/10b59144/README.md -- diff --git a/README.md b/README.md index c99ddbe..b4a9b23 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ https://ignite.apache.org/;>https://ignite.apache.org/images/logo3.png; hspace="20"/> -https://ci.ignite.apache.org/viewType.html?buildTypeId=Ignite20Tests_RunAll_Ignite20Tests=%3Cdefault%3E;>http://ci.ignite.apache.org/app/rest/builds/buildType:(id:Ignite20Tests_RunAll)/statusIcon.svg"/> +https://ci.ignite.apache.org/viewType.html?buildTypeId=IgniteTests24Java8_RunAll_IgniteTests24Java8=%3Cdefault%3E;>https://ci.ignite.apache.org/app/rest/builds/buildType:(id:IgniteTests24Java8_RunAll)/statusIcon.svg"/> ## Getting Started
ignite git commit: IGNITE-9129 P2P class deployment with ZK discovery fixed.
Repository: ignite
Updated Branches:
refs/heads/master 0b394056b -> 0e9bb1c0e
IGNITE-9129 P2P class deployment with ZK discovery fixed.
Signed-off-by: agura
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0e9bb1c0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0e9bb1c0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0e9bb1c0
Branch: refs/heads/master
Commit: 0e9bb1c0e50ed8a29ccd3d6a9e2bd5311b6b7912
Parents: 0b39405
Author: Pavel Kovalenko
Authored: Thu Aug 2 16:18:44 2018 +0300
Committer: agura
Committed: Thu Aug 2 16:19:24 2018 +0300
--
.../continuous/GridContinuousProcessor.java | 72 +++-
.../GridP2PContinuousDeploymentSelfTest.java| 70 ++-
.../zk/ZookeeperDiscoverySpiTestSuite2.java | 3 +
3 files changed, 109 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/0e9bb1c0/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
index 2d48b7d..6723ea4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
@@ -544,7 +544,7 @@ public class GridContinuousProcessor extends
GridProcessorAdapter {
* @param routineInfo Routine info.
*/
private void startDiscoveryDataRoutine(ContinuousRoutineInfo routineInfo) {
-IgnitePredicate nodeFilter = null;
+IgnitePredicate nodeFilter;
try {
if (routineInfo.nodeFilter != null) {
@@ -552,6 +552,8 @@ public class GridContinuousProcessor extends
GridProcessorAdapter {
ctx.resource().injectGeneric(nodeFilter);
}
+else
+nodeFilter = null;
}
catch (IgniteCheckedException e) {
U.error(log, "Failed to unmarshal continuous routine filter,
ignore routine [" +
@@ -561,45 +563,47 @@ public class GridContinuousProcessor extends
GridProcessorAdapter {
return;
}
-if (nodeFilter == null ||
nodeFilter.apply(ctx.discovery().localNode())) {
-GridContinuousHandler hnd;
+ctx.discovery().localJoinFuture().listen(f ->
ctx.closure().runLocalSafe(() -> {
+if (nodeFilter == null ||
nodeFilter.apply(ctx.discovery().localNode())) {
+GridContinuousHandler hnd;
-try {
-hnd = U.unmarshal(marsh, routineInfo.hnd,
U.resolveClassLoader(ctx.config()));
+try {
+hnd = U.unmarshal(marsh, routineInfo.hnd,
U.resolveClassLoader(ctx.config()));
-if (ctx.config().isPeerClassLoadingEnabled())
-hnd.p2pUnmarshal(routineInfo.srcNodeId, ctx);
-}
-catch (IgniteCheckedException e) {
-U.error(log, "Failed to unmarshal continuous routine handler,
ignore routine [" +
-"routineId=" + routineInfo.routineId +
-", srcNodeId=" + routineInfo.srcNodeId + ']', e);
+if (ctx.config().isPeerClassLoadingEnabled())
+hnd.p2pUnmarshal(routineInfo.srcNodeId, ctx);
+}
+catch (IgniteCheckedException e) {
+U.error(log, "Failed to unmarshal continuous routine
handler, ignore routine [" +
+"routineId=" + routineInfo.routineId +
+", srcNodeId=" + routineInfo.srcNodeId + ']', e);
-return;
-}
+return;
+}
-try {
-registerHandler(routineInfo.srcNodeId,
-routineInfo.routineId,
-hnd,
-routineInfo.bufSize,
-routineInfo.interval,
-routineInfo.autoUnsubscribe,
-false);
-}
-catch (IgniteCheckedException e) {
-U.error(log, "Failed to register continuous routine handler,
ignore routine [" +
-"routineId=" + routineInfo.routineId +
-", srcNodeId=" + routineInfo.srcNodeId + ']', e);
+try {
+registerHandler(routineInfo.srcNodeId,
+routineInfo.routineId,
+hnd,
+routineInfo.bufSize,
ignite git commit: IGNITE-8714 CacheEntryEvent.getOldValue should be available
Repository: ignite
Updated Branches:
refs/heads/master 8811a143b -> 0b394056b
IGNITE-8714 CacheEntryEvent.getOldValue should be available
Signed-off-by: Anton Vinogradov
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0b394056
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0b394056
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0b394056
Branch: refs/heads/master
Commit: 0b394056b35e1874ef99f712462b5f16537751a8
Parents: 8811a14
Author: NSAmelchev
Authored: Thu Aug 2 16:09:16 2018 +0300
Committer: Anton Vinogradov
Committed: Thu Aug 2 16:09:16 2018 +0300
--
.../datastructures/CacheDataStructuresManager.java | 5 +++--
.../continuous/CacheContinuousQueryManager.java | 4 ++--
.../processors/service/GridServiceProcessor.java| 5 +++--
.../cache/IgniteCacheEntryListenerAbstractTest.java | 16
...inuousQueryFactoryFilterRandomOperationTest.java | 6 +++---
.../CacheContinuousQueryRandomOperationsTest.java | 15 ---
.../CacheContinuousQueryVariationsTest.java | 12 ++--
...ContinuousWithTransformerReplicatedSelfTest.java | 2 +-
.../GridCacheContinuousQueryAbstractSelfTest.java | 6 +++---
.../cpp/core-test/src/continuous_query_test.cpp | 6 +++---
.../Query/Continuous/ContinuousQueryAbstractTest.cs | 10 +-
.../Impl/Cache/Event/CacheEntryRemoveEvent.cs | 4 ++--
.../Cache/Query/Continuous/ContinuousQueryUtils.cs | 2 +-
13 files changed, 48 insertions(+), 45 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/0b394056/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
index ccfdc15..7d45c81 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
@@ -29,6 +29,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -70,8 +71,8 @@ import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import java.util.concurrent.ConcurrentHashMap;
+import static javax.cache.event.EventType.REMOVED;
import static org.apache.ignite.internal.GridClosureCallMode.BROADCAST;
/**
@@ -294,7 +295,7 @@ public class CacheDataStructuresManager extends
GridCacheManagerAdapter {
for (final GridCacheQueueProxy queue :
queuesMap.values()) {
if
(queue.name().equals(key.queueName())) {
-if (hdr == null) {
+if (e.getEventType() == REMOVED) {
GridCacheQueueHeader oldHdr =
(GridCacheQueueHeader)e.getOldValue();
assert oldHdr != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/0b394056/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
index c7635e0..4005dd8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
@@ -380,7 +380,7 @@ public class CacheContinuousQueryManager extends
GridCacheManagerAdapter {
cctx.cacheId(),
evtType,
key,
-newVal,
+evtType == REMOVED && lsnr.oldValueRequired() ? oldVal :
newVal,
lsnr.oldValueRequired() ? oldVal : null,
ignite git commit: IGNITE-9111 Do not wait for deactivation.
Repository: ignite
Updated Branches:
refs/heads/master d632eb6f8 -> 8811a143b
IGNITE-9111 Do not wait for deactivation.
Signed-off-by: agura
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8811a143
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8811a143
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8811a143
Branch: refs/heads/master
Commit: 8811a143b525804905fd661b2c66d508b70e4697
Parents: d632eb6
Author: Pavel Kovalenko
Authored: Thu Aug 2 15:51:17 2018 +0300
Committer: agura
Committed: Thu Aug 2 15:51:46 2018 +0300
--
.../cluster/DiscoveryDataClusterState.java | 7 ---
.../cluster/GridClusterStateProcessor.java | 2 +-
.../IgniteClusterActivateDeactivateTest.java| 48
3 files changed, 49 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/8811a143/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/DiscoveryDataClusterState.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/DiscoveryDataClusterState.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/DiscoveryDataClusterState.java
index b6029a3..65d6088 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/DiscoveryDataClusterState.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/DiscoveryDataClusterState.java
@@ -173,13 +173,6 @@ public class DiscoveryDataClusterState implements
Serializable {
}
/**
- * @return {@code True} if cluster active state change is in progress,
{@code false} otherwise.
- */
-public boolean activeStateChanging() {
-return transition() && (prevState == null || (prevState.active !=
active));
-}
-
-/**
* @return State change exchange version.
*/
public AffinityTopologyVersion transitionTopologyVersion() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/8811a143/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
index da0bbf6..8d2620f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
@@ -179,7 +179,7 @@ public class GridClusterStateProcessor extends
GridProcessorAdapter implements I
assert globalState != null;
-if (globalState.transition() && globalState.activeStateChanging()) {
+if (globalState.transition() && globalState.active()) {
Boolean transitionRes = globalState.transitionResult();
if (transitionRes != null)
http://git-wip-us.apache.org/repos/asf/ignite/blob/8811a143/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java
index 3b39bfb..4ff97ba 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java
@@ -42,6 +42,7 @@ import
org.apache.ignite.internal.managers.discovery.IgniteDiscoverySpi;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsFullMessage;
import
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleMessage;
+import org.apache.ignite.internal.processors.cluster.DiscoveryDataClusterState;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.G;
import org.apache.ignite.internal.util.typedef.internal.CU;
@@ -53,6 +54,7 @@ import
org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import
ignite git commit: # Conflicts:
Repository: ignite
Updated Branches:
refs/heads/ignite-8714 [created] 981bb8c0c
# Conflicts:
Signed-off-by: Anton Vinogradov
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/981bb8c0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/981bb8c0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/981bb8c0
Branch: refs/heads/ignite-8714
Commit: 981bb8c0c0b40f97f0c2b8c284d8ae821250257a
Parents: d632eb6
Author: Anton Vinogradov
Authored: Thu Aug 2 15:37:43 2018 +0300
Committer: Anton Vinogradov
Committed: Thu Aug 2 15:37:43 2018 +0300
--
.../datastructures/CacheDataStructuresManager.java | 5 +++--
.../continuous/CacheContinuousQueryManager.java | 4 ++--
.../processors/service/GridServiceProcessor.java| 5 +++--
.../cache/IgniteCacheEntryListenerAbstractTest.java | 16
...inuousQueryFactoryFilterRandomOperationTest.java | 6 +++---
.../CacheContinuousQueryRandomOperationsTest.java | 15 ---
.../CacheContinuousQueryVariationsTest.java | 12 ++--
...ContinuousWithTransformerReplicatedSelfTest.java | 2 +-
.../GridCacheContinuousQueryAbstractSelfTest.java | 6 +++---
.../cpp/core-test/src/continuous_query_test.cpp | 6 +++---
.../Query/Continuous/ContinuousQueryAbstractTest.cs | 10 +-
.../Impl/Cache/Event/CacheEntryRemoveEvent.cs | 4 ++--
.../Cache/Query/Continuous/ContinuousQueryUtils.cs | 2 +-
13 files changed, 48 insertions(+), 45 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/981bb8c0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
index ccfdc15..7d45c81 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
@@ -29,6 +29,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -70,8 +71,8 @@ import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import java.util.concurrent.ConcurrentHashMap;
+import static javax.cache.event.EventType.REMOVED;
import static org.apache.ignite.internal.GridClosureCallMode.BROADCAST;
/**
@@ -294,7 +295,7 @@ public class CacheDataStructuresManager extends
GridCacheManagerAdapter {
for (final GridCacheQueueProxy queue :
queuesMap.values()) {
if
(queue.name().equals(key.queueName())) {
-if (hdr == null) {
+if (e.getEventType() == REMOVED) {
GridCacheQueueHeader oldHdr =
(GridCacheQueueHeader)e.getOldValue();
assert oldHdr != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/981bb8c0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
index c7635e0..4005dd8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
@@ -380,7 +380,7 @@ public class CacheContinuousQueryManager extends
GridCacheManagerAdapter {
cctx.cacheId(),
evtType,
key,
-newVal,
+evtType == REMOVED && lsnr.oldValueRequired() ? oldVal :
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-wc-644 [deleted] cbdd4e962
ignite git commit: WC-644 Web Console: Refactored modal for snapshot schedule creation.
Repository: ignite
Updated Branches:
refs/heads/ignite-wc-644 [created] cbdd4e962
WC-644 Web Console: Refactored modal for snapshot schedule creation.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cbdd4e96
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cbdd4e96
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cbdd4e96
Branch: refs/heads/ignite-wc-644
Commit: cbdd4e962dc433bef7472e273b73df05d875f1da
Parents: d632eb6
Author: Alexey Kuznetsov
Authored: Thu Aug 2 18:53:41 2018 +0700
Committer: Alexey Kuznetsov
Committed: Thu Aug 2 18:53:41 2018 +0700
--
.../app/primitives/form-field/checkbox.pug | 2 +-
.../app/primitives/form-field/index.scss| 44
.../app/primitives/form-field/number.pug| 5 ++-
3 files changed, 48 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbdd4e96/modules/web-console/frontend/app/primitives/form-field/checkbox.pug
--
diff --git
a/modules/web-console/frontend/app/primitives/form-field/checkbox.pug
b/modules/web-console/frontend/app/primitives/form-field/checkbox.pug
index 09596d4..b498cbd 100644
--- a/modules/web-console/frontend/app/primitives/form-field/checkbox.pug
+++ b/modules/web-console/frontend/app/primitives/form-field/checkbox.pug
@@ -15,7 +15,7 @@
limitations under the License.
mixin form-field__checkbox({ label, model, name, disabled, required, tip })
-.form-field.form-field__checkbox
+.form-field.form-field__checkbox(id=`{{ ${name} }}Field`)
+form-field__label({ label, name, required })
+form-field__tooltip({ title: tip, options: tipOpts })
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbdd4e96/modules/web-console/frontend/app/primitives/form-field/index.scss
--
diff --git a/modules/web-console/frontend/app/primitives/form-field/index.scss
b/modules/web-console/frontend/app/primitives/form-field/index.scss
index 83dd55d..1dd4fd3 100644
--- a/modules/web-console/frontend/app/primitives/form-field/index.scss
+++ b/modules/web-console/frontend/app/primitives/form-field/index.scss
@@ -215,6 +215,7 @@
box-sizing: border-box;
width: 100%;
max-width: initial;
+min-width: 0px;
height: 36px;
padding: 9px 10px;
margin-right: 0;
@@ -241,6 +242,13 @@
}
}
+&--postfix::after {
+content: attr(data-postfix);
+display: inline-flex;
+place-self: center;
+margin-left: 10px;
+}
+
// Added right offset to appearance of input for invalid password
& > input[type='email'].ng-invalid.ng-touched,
& > input[type='text'].ng-invalid.ng-touched,
@@ -261,6 +269,8 @@
right: 0;
bottom: 0;
+display: flex;
+
[ng-message] {
// TODO: remove after replace all fields to new
overflow: visible !important;
@@ -268,6 +278,12 @@
}
}
+&__control--postfix + &__errors::after {
+content: attr(data-postfix);
+margin-left: 10px;
+visibility: hidden;
+}
+
&__error {
z-index: 2;
position: relative;
@@ -328,6 +344,7 @@
width: auto;
height: auto;
margin: 0;
+border-radius: 0;
}
}
@@ -382,3 +399,30 @@
height: 36px;
}
}
+
+.form-fieldset {
+padding: 10px;
+
+border: 1px solid hsla(0,0%,77%,.5);
+border-radius: 4px;
+
+legend {
+width: auto;
+margin: 0 -5px;
+padding: 0 5px;
+
+border: 0;
+
+color: #393939;
+font-size: 14px;
+line-height: 1.42857;
+}
+
+legend + * {
+margin-top: 0 !important;
+}
+
+& > *:last-child {
+margin-bottom: 0 !important;
+}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/cbdd4e96/modules/web-console/frontend/app/primitives/form-field/number.pug
--
diff --git a/modules/web-console/frontend/app/primitives/form-field/number.pug
b/modules/web-console/frontend/app/primitives/form-field/number.pug
index e5f1454..11f8e22 100644
--- a/modules/web-console/frontend/app/primitives/form-field/number.pug
+++ b/modules/web-console/frontend/app/primitives/form-field/number.pug
@@ -14,14 +14,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-mixin form-field__number({ label, model, name, disabled, required,
ignite git commit: IGNITE-8715 Problems with Closeable objects from Factory
Repository: ignite
Updated Branches:
refs/heads/master 1cdf7ef99 -> d632eb6f8
IGNITE-8715 Problems with Closeable objects from Factory
Signed-off-by: Anton Vinogradov
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d632eb6f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d632eb6f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d632eb6f
Branch: refs/heads/master
Commit: d632eb6f8d5f0f23111042dfab3274ed20052a4a
Parents: 1cdf7ef
Author: pereslegin-pa
Authored: Thu Aug 2 14:19:47 2018 +0300
Committer: Anton Vinogradov
Committed: Thu Aug 2 14:19:47 2018 +0300
--
.../internal/processors/cache/GridCacheContext.java | 4
.../cache/GridCacheLoaderWriterStore.java | 6 ++
.../continuous/CacheContinuousQueryManager.java | 16 ++--
3 files changed, 24 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/d632eb6f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 191734b..61b1878 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.cache;
+import java.io.Closeable;
import java.io.Externalizable;
import java.io.IOException;
import java.io.InvalidObjectException;
@@ -2011,6 +2012,9 @@ public class GridCacheContext implements
Externalizable {
dataStructuresMgr = null;
cacheObjCtx = null;
+if (expiryPlc instanceof Closeable)
+U.closeQuiet((Closeable)expiryPlc);
+
mgrs.clear();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d632eb6f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStore.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStore.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStore.java
index 03beaf0..cf07b18 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStore.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStore.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.cache;
+import java.io.Closeable;
import java.io.Serializable;
import java.util.Collection;
import java.util.Collections;
@@ -26,6 +27,7 @@ import javax.cache.integration.CacheLoader;
import javax.cache.integration.CacheWriter;
import org.apache.ignite.cache.store.CacheStore;
import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiInClosure;
import org.apache.ignite.lifecycle.LifecycleAware;
import org.jetbrains.annotations.Nullable;
@@ -81,9 +83,13 @@ class GridCacheLoaderWriterStore implements
CacheStore, LifecycleAwa
@Override public void stop() {
if (ldr instanceof LifecycleAware)
((LifecycleAware)ldr).stop();
+else if (ldr instanceof Closeable)
+U.closeQuiet((Closeable)ldr);
if (writer instanceof LifecycleAware)
((LifecycleAware)writer).stop();
+else if (writer instanceof Closeable)
+U.closeQuiet((Closeable)writer);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/d632eb6f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
index 1cdc014..c7635e0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.cache.query.continuous;
+import java.io.Closeable;
import java.io.Externalizable;
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-9151 [deleted] f3be2fbb1
[1/2] ignite git commit: IGNITE-9151 Web Console: Fixed logic of removing cluster items: caches, models, igfss.
Repository: ignite
Updated Branches:
refs/heads/master 5fc18e6f1 -> 1cdf7ef99
http://git-wip-us.apache.org/repos/asf/ignite/blob/1cdf7ef9/modules/web-console/frontend/app/services/Clusters.js
--
diff --git a/modules/web-console/frontend/app/services/Clusters.js
b/modules/web-console/frontend/app/services/Clusters.js
index d76f862..c33c145 100644
--- a/modules/web-console/frontend/app/services/Clusters.js
+++ b/modules/web-console/frontend/app/services/Clusters.js
@@ -57,7 +57,9 @@ export default class Clusters {
messageQueueLimit = this.messageQueueLimit.default,
ackSendThreshold = this.ackSendThreshold.default
) => {
-if (currentValue ===
this.unacknowledgedMessagesBufferSize.default) return currentValue;
+if (currentValue === this.unacknowledgedMessagesBufferSize.default)
+return currentValue;
+
const {validRatio} = this.unacknowledgedMessagesBufferSize;
return Math.max(messageQueueLimit * validRatio, ackSendThreshold *
validRatio);
},
@@ -253,7 +255,9 @@ export default class Clusters {
maxSize: {
default: '0.2 * totalMemoryAvailable',
min: (dataRegion) => {
-if (!dataRegion) return;
+if (!dataRegion)
+return;
+
return dataRegion.initialSize ||
this.dataRegion.initialSize.default;
}
},
@@ -267,11 +271,14 @@ export default class Clusters {
default: 100,
min: 11,
max: (cluster, dataRegion) => {
-if (!cluster || !dataRegion || !dataRegion.maxSize) return;
+if (!cluster || !dataRegion || !dataRegion.maxSize)
+return;
+
const perThreadLimit = 10; // Took from Ignite
const maxSize = dataRegion.maxSize;
const pageSize = cluster.dataStorageConfiguration.pageSize ||
this.dataStorageConfiguration.pageSize.default;
const maxPoolSize = Math.floor(maxSize / pageSize /
perThreadLimit);
+
return maxPoolSize;
}
},
@@ -293,7 +300,10 @@ export default class Clusters {
addDataRegionConfiguration(cluster) {
const dataRegionConfigurations = get(cluster,
'dataStorageConfiguration.dataRegionConfigurations');
-if (!dataRegionConfigurations) return;
+
+if (!dataRegionConfigurations)
+return;
+
return
dataRegionConfigurations.push(Object.assign(this.makeBlankDataRegionConfiguration(),
{
name: uniqueName('New data region',
dataRegionConfigurations.concat(cluster.dataStorageConfiguration.defaultDataRegionConfiguration))
}));
@@ -318,7 +328,10 @@ export default class Clusters {
defaultMemoryPolicyExists: (name, items = []) => {
const def = this.memoryPolicy.name.default;
const normalizedName = (name || def);
-if (normalizedName === def) return true;
+
+if (normalizedName === def)
+return true;
+
return items.some((policy) => (policy.name || def) ===
normalizedName);
},
uniqueMemoryPolicyName: (a, items = []) => {
@@ -330,7 +343,9 @@ export default class Clusters {
default: 100,
min: 11,
max: (cluster, memoryPolicy) => {
-if (!memoryPolicy || !memoryPolicy.maxSize) return;
+if (!memoryPolicy || !memoryPolicy.maxSize)
+return;
+
const perThreadLimit = 10; // Took from Ignite
const maxSize = memoryPolicy.maxSize;
const pageSize = cluster.memoryConfiguration.pageSize ||
this.memoryConfiguration.pageSize.default;
@@ -406,7 +421,10 @@ export default class Clusters {
addMemoryPolicy(cluster) {
const memoryPolicies = get(cluster,
'memoryConfiguration.memoryPolicies');
-if (!memoryPolicies) return;
+
+if (!memoryPolicies)
+return;
+
return memoryPolicies.push(Object.assign(this.makeBlankMemoryPolicy(),
{
// Blank name for default policy if there are not other policies
name: memoryPolicies.length ? uniqueName('New memory policy',
memoryPolicies) : ''
http://git-wip-us.apache.org/repos/asf/ignite/blob/1cdf7ef9/modules/web-console/frontend/app/services/FormUtils.service.js
--
diff --git a/modules/web-console/frontend/app/services/FormUtils.service.js
b/modules/web-console/frontend/app/services/FormUtils.service.js
index da6b417..2c81c57 100644
--- a/modules/web-console/frontend/app/services/FormUtils.service.js
+++ b/modules/web-console/frontend/app/services/FormUtils.service.js
@@ -329,12 +329,19 @@ export default ['IgniteFormUtils',
[2/2] ignite git commit: IGNITE-9151 Web Console: Fixed logic of removing cluster items: caches, models, igfss.
IGNITE-9151 Web Console: Fixed logic of removing cluster items: caches, models,
igfss.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1cdf7ef9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1cdf7ef9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1cdf7ef9
Branch: refs/heads/master
Commit: 1cdf7ef992c36a1b8f52021dd91705c51257d1c1
Parents: 5fc18e6
Author: Alexey Kuznetsov
Authored: Thu Aug 2 17:18:50 2018 +0700
Committer: Alexey Kuznetsov
Committed: Thu Aug 2 17:18:50 2018 +0700
--
.../form-field/showValidationError.directive.js | 6 +-
.../grid-column-selector/controller.js | 8 +-
.../list-editable-save-on-changes/directives.js | 14 ++-
.../list-editable-transclude/directive.js | 12 +-
.../app/components/list-editable/controller.js | 6 +-
.../components/cluster-edit-form/controller.js | 2 -
.../components/model-edit-form/controller.js| 10 +-
.../page-configure-basic/controller.js | 13 ++-
.../pco-grid-column-categories/directive.js | 4 +-
.../components/formUICanExitGuard.js| 12 +-
.../components/modal-import-models/component.js | 23 ++--
.../tables-action-cell/component.js | 14 ++-
.../modal-preview-project/controller.js | 10 +-
.../components/pc-form-field-size/controller.js | 8 +-
.../components/pc-items-table/controller.js | 26 -
.../components/pc-ui-grid-filters/directive.js | 4 +-
.../components/pc-ui-grid-filters/index.js | 5 +-
.../components/pcIsInCollection.js | 4 +-
.../page-configure/components/pcValidation.js | 8 +-
.../app/components/page-configure/index.js | 14 ++-
.../app/components/page-configure/reducer.js| 90 ++-
.../page-configure/services/ConfigureState.js | 5 +
.../app/components/page-configure/states.js | 88 --
.../components/page-configure/store/effects.js | 114 +++
.../page-configure/store/selectors.js | 50 +++-
.../transitionHooks/errorState.js | 5 +-
.../frontend/app/components/page-signin/run.js | 5 +-
.../components/panel-collapsible/controller.js | 19 +++-
.../app/components/ui-grid-filters/directive.js | 3 +-
.../app/components/ui-grid-filters/index.js | 4 +-
.../generator/ConfigurationGenerator.js | 3 +-
.../field/bs-select-placeholder.directive.js| 4 +-
.../modules/form/validator/unique.directive.js | 6 +-
.../web-console/frontend/app/services/Caches.js | 10 +-
.../frontend/app/services/Clusters.js | 32 --
.../frontend/app/services/FormUtils.service.js | 13 ++-
.../web-console/frontend/app/services/IGFSs.js | 8 +-
.../web-console/frontend/app/services/Models.js | 17 ++-
.../frontend/app/services/exceptionHandler.js | 4 +-
39 files changed, 509 insertions(+), 174 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/1cdf7ef9/modules/web-console/frontend/app/components/form-field/showValidationError.directive.js
--
diff --git
a/modules/web-console/frontend/app/components/form-field/showValidationError.directive.js
b/modules/web-console/frontend/app/components/form-field/showValidationError.directive.js
index 32123cc..8720c56 100644
---
a/modules/web-console/frontend/app/components/form-field/showValidationError.directive.js
+++
b/modules/web-console/frontend/app/components/form-field/showValidationError.directive.js
@@ -24,10 +24,14 @@ export function directive($timeout) {
require: ['ngModel', '?^^bsCollapseTarget', '?^^igniteFormField',
'?^^panelCollapsible'],
link(scope, el, attr, [ngModel, bsCollapseTarget, igniteFormField,
panelCollapsible]) {
const off = scope.$on('$showValidationError', (e, target) => {
-if (target !== ngModel) return;
+if (target !== ngModel)
+return;
+
ngModel.$setTouched();
+
bsCollapseTarget && bsCollapseTarget.open();
panelCollapsible && panelCollapsible.open();
+
$timeout(() => {
if (el[0].scrollIntoViewIfNeeded)
el[0].scrollIntoViewIfNeeded();
http://git-wip-us.apache.org/repos/asf/ignite/blob/1cdf7ef9/modules/web-console/frontend/app/components/grid-column-selector/controller.js
--
diff --git
a/modules/web-console/frontend/app/components/grid-column-selector/controller.js
b/modules/web-console/frontend/app/components/grid-column-selector/controller.js
index 1f04861..2f5554e 100644
---
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/wc-633 [deleted] 6f28066a8
ignite git commit: WC-633 Web Console: Added support to view baseline with ADMIN_VIEW permissions.
Repository: ignite
Updated Branches:
refs/heads/wc-633 [created] 6f28066a8
WC-633 Web Console: Added support to view baseline with ADMIN_VIEW permissions.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6f28066a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6f28066a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6f28066a
Branch: refs/heads/wc-633
Commit: 6f28066a858f8191b9c07fafa04fc957c5b41f76
Parents: 5fc18e6
Author: Alexey Kuznetsov
Authored: Thu Aug 2 16:56:37 2018 +0700
Committer: Alexey Kuznetsov
Committed: Thu Aug 2 16:56:37 2018 +0700
--
.../visor/baseline/VisorBaselineTask.java | 2 +-
.../visor/baseline/VisorBaselineViewTask.java | 73
2 files changed, 74 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f28066a/modules/core/src/main/java/org/apache/ignite/internal/visor/baseline/VisorBaselineTask.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/baseline/VisorBaselineTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/baseline/VisorBaselineTask.java
index 721b4b3..3c00452 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/baseline/VisorBaselineTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/baseline/VisorBaselineTask.java
@@ -34,7 +34,7 @@ import org.apache.ignite.internal.visor.VisorOneNodeTask;
import org.jetbrains.annotations.Nullable;
/**
- * Task that will collect baseline topology information.
+ * Task that will collect information about baseline topology and can change
its state.
*/
@GridInternal
public class VisorBaselineTask extends VisorOneNodeTask {
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f28066a/modules/core/src/main/java/org/apache/ignite/internal/visor/baseline/VisorBaselineViewTask.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/baseline/VisorBaselineViewTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/baseline/VisorBaselineViewTask.java
new file mode 100644
index 000..472b907
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/baseline/VisorBaselineViewTask.java
@@ -0,0 +1,73 @@
+/*
+ * 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.visor.baseline;
+
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.cluster.IgniteClusterEx;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Task that will collect information about baseline topology.
+ */
+@GridInternal
+public class VisorBaselineViewTask extends VisorOneNodeTask {
+/** */
+private static final long serialVersionUID = 0L;
+
+/** {@inheritDoc} */
+@Override protected VisorBaselineViewJob job(Void arg) {
+return new VisorBaselineViewJob(arg, debug);
+}
+
+/**
+ * Job that will collect baseline topology information.
+ */
+private static class VisorBaselineViewJob extends VisorJob {
+/** */
+private static final long serialVersionUID = 0L;
+
+/**
+ * @param arg Formal job argument.
+ * @param debug Debug flag.
+ */
+private VisorBaselineViewJob(Void arg, boolean debug) {
+super(arg, debug);
+}
+
+/** {@inheritDoc} */
+@Override protected VisorBaselineTaskResult run(@Nullable Void arg)
throws IgniteException {
+IgniteClusterEx cluster = ignite.cluster();
+
+return new VisorBaselineTaskResult(
+ignite.cluster().active(),
+cluster.topologyVersion(),
[2/2] ignite git commit: IGNITE-9151 Web Console: Fixed remove cluster items logic.
IGNITE-9151 Web Console: Fixed remove cluster items logic.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f3be2fbb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f3be2fbb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f3be2fbb
Branch: refs/heads/ignite-9151
Commit: f3be2fbb152fef30ab5c48e6443dd578652a112c
Parents: 4439119
Author: Alexey Kuznetsov
Authored: Thu Aug 2 14:45:19 2018 +0700
Committer: Alexey Kuznetsov
Committed: Thu Aug 2 14:45:19 2018 +0700
--
.../form-field/showValidationError.directive.js | 6 +-
.../grid-column-selector/controller.js | 8 +-
.../list-editable-save-on-changes/directives.js | 14 ++-
.../list-editable-transclude/directive.js | 12 +-
.../app/components/list-editable/controller.js | 6 +-
.../components/cluster-edit-form/controller.js | 2 -
.../components/model-edit-form/controller.js| 10 +-
.../page-configure-basic/controller.js | 13 ++-
.../pco-grid-column-categories/directive.js | 4 +-
.../components/formUICanExitGuard.js| 12 +-
.../components/modal-import-models/component.js | 23 ++--
.../tables-action-cell/component.js | 14 ++-
.../modal-preview-project/controller.js | 10 +-
.../components/pc-form-field-size/controller.js | 8 +-
.../components/pc-items-table/controller.js | 26 -
.../components/pc-ui-grid-filters/directive.js | 4 +-
.../components/pc-ui-grid-filters/index.js | 5 +-
.../components/pcIsInCollection.js | 4 +-
.../page-configure/components/pcValidation.js | 8 +-
.../app/components/page-configure/index.js | 14 ++-
.../app/components/page-configure/reducer.js| 90 ++-
.../page-configure/services/ConfigureState.js | 5 +
.../app/components/page-configure/states.js | 88 --
.../components/page-configure/store/effects.js | 114 +++
.../page-configure/store/selectors.js | 50 +++-
.../transitionHooks/errorState.js | 5 +-
.../frontend/app/components/page-signin/run.js | 5 +-
.../components/panel-collapsible/controller.js | 19 +++-
.../app/components/ui-grid-filters/directive.js | 3 +-
.../app/components/ui-grid-filters/index.js | 4 +-
.../generator/ConfigurationGenerator.js | 3 +-
.../field/bs-select-placeholder.directive.js| 4 +-
.../modules/form/validator/unique.directive.js | 6 +-
.../web-console/frontend/app/services/Caches.js | 10 +-
.../frontend/app/services/Clusters.js | 32 --
.../frontend/app/services/FormUtils.service.js | 13 ++-
.../web-console/frontend/app/services/IGFSs.js | 8 +-
.../web-console/frontend/app/services/Models.js | 17 ++-
.../frontend/app/services/exceptionHandler.js | 4 +-
39 files changed, 509 insertions(+), 174 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/f3be2fbb/modules/web-console/frontend/app/components/form-field/showValidationError.directive.js
--
diff --git
a/modules/web-console/frontend/app/components/form-field/showValidationError.directive.js
b/modules/web-console/frontend/app/components/form-field/showValidationError.directive.js
index 32123cc..8720c56 100644
---
a/modules/web-console/frontend/app/components/form-field/showValidationError.directive.js
+++
b/modules/web-console/frontend/app/components/form-field/showValidationError.directive.js
@@ -24,10 +24,14 @@ export function directive($timeout) {
require: ['ngModel', '?^^bsCollapseTarget', '?^^igniteFormField',
'?^^panelCollapsible'],
link(scope, el, attr, [ngModel, bsCollapseTarget, igniteFormField,
panelCollapsible]) {
const off = scope.$on('$showValidationError', (e, target) => {
-if (target !== ngModel) return;
+if (target !== ngModel)
+return;
+
ngModel.$setTouched();
+
bsCollapseTarget && bsCollapseTarget.open();
panelCollapsible && panelCollapsible.open();
+
$timeout(() => {
if (el[0].scrollIntoViewIfNeeded)
el[0].scrollIntoViewIfNeeded();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f3be2fbb/modules/web-console/frontend/app/components/grid-column-selector/controller.js
--
diff --git
a/modules/web-console/frontend/app/components/grid-column-selector/controller.js
b/modules/web-console/frontend/app/components/grid-column-selector/controller.js
index 1f04861..2f5554e 100644
---
a/modules/web-console/frontend/app/components/grid-column-selector/controller.js
+++
[1/2] ignite git commit: IGNITE-9151 Web Console: Fixed remove cluster items logic.
Repository: ignite
Updated Branches:
refs/heads/ignite-9151 [created] f3be2fbb1
http://git-wip-us.apache.org/repos/asf/ignite/blob/f3be2fbb/modules/web-console/frontend/app/services/Clusters.js
--
diff --git a/modules/web-console/frontend/app/services/Clusters.js
b/modules/web-console/frontend/app/services/Clusters.js
index d76f862..c33c145 100644
--- a/modules/web-console/frontend/app/services/Clusters.js
+++ b/modules/web-console/frontend/app/services/Clusters.js
@@ -57,7 +57,9 @@ export default class Clusters {
messageQueueLimit = this.messageQueueLimit.default,
ackSendThreshold = this.ackSendThreshold.default
) => {
-if (currentValue ===
this.unacknowledgedMessagesBufferSize.default) return currentValue;
+if (currentValue === this.unacknowledgedMessagesBufferSize.default)
+return currentValue;
+
const {validRatio} = this.unacknowledgedMessagesBufferSize;
return Math.max(messageQueueLimit * validRatio, ackSendThreshold *
validRatio);
},
@@ -253,7 +255,9 @@ export default class Clusters {
maxSize: {
default: '0.2 * totalMemoryAvailable',
min: (dataRegion) => {
-if (!dataRegion) return;
+if (!dataRegion)
+return;
+
return dataRegion.initialSize ||
this.dataRegion.initialSize.default;
}
},
@@ -267,11 +271,14 @@ export default class Clusters {
default: 100,
min: 11,
max: (cluster, dataRegion) => {
-if (!cluster || !dataRegion || !dataRegion.maxSize) return;
+if (!cluster || !dataRegion || !dataRegion.maxSize)
+return;
+
const perThreadLimit = 10; // Took from Ignite
const maxSize = dataRegion.maxSize;
const pageSize = cluster.dataStorageConfiguration.pageSize ||
this.dataStorageConfiguration.pageSize.default;
const maxPoolSize = Math.floor(maxSize / pageSize /
perThreadLimit);
+
return maxPoolSize;
}
},
@@ -293,7 +300,10 @@ export default class Clusters {
addDataRegionConfiguration(cluster) {
const dataRegionConfigurations = get(cluster,
'dataStorageConfiguration.dataRegionConfigurations');
-if (!dataRegionConfigurations) return;
+
+if (!dataRegionConfigurations)
+return;
+
return
dataRegionConfigurations.push(Object.assign(this.makeBlankDataRegionConfiguration(),
{
name: uniqueName('New data region',
dataRegionConfigurations.concat(cluster.dataStorageConfiguration.defaultDataRegionConfiguration))
}));
@@ -318,7 +328,10 @@ export default class Clusters {
defaultMemoryPolicyExists: (name, items = []) => {
const def = this.memoryPolicy.name.default;
const normalizedName = (name || def);
-if (normalizedName === def) return true;
+
+if (normalizedName === def)
+return true;
+
return items.some((policy) => (policy.name || def) ===
normalizedName);
},
uniqueMemoryPolicyName: (a, items = []) => {
@@ -330,7 +343,9 @@ export default class Clusters {
default: 100,
min: 11,
max: (cluster, memoryPolicy) => {
-if (!memoryPolicy || !memoryPolicy.maxSize) return;
+if (!memoryPolicy || !memoryPolicy.maxSize)
+return;
+
const perThreadLimit = 10; // Took from Ignite
const maxSize = memoryPolicy.maxSize;
const pageSize = cluster.memoryConfiguration.pageSize ||
this.memoryConfiguration.pageSize.default;
@@ -406,7 +421,10 @@ export default class Clusters {
addMemoryPolicy(cluster) {
const memoryPolicies = get(cluster,
'memoryConfiguration.memoryPolicies');
-if (!memoryPolicies) return;
+
+if (!memoryPolicies)
+return;
+
return memoryPolicies.push(Object.assign(this.makeBlankMemoryPolicy(),
{
// Blank name for default policy if there are not other policies
name: memoryPolicies.length ? uniqueName('New memory policy',
memoryPolicies) : ''
http://git-wip-us.apache.org/repos/asf/ignite/blob/f3be2fbb/modules/web-console/frontend/app/services/FormUtils.service.js
--
diff --git a/modules/web-console/frontend/app/services/FormUtils.service.js
b/modules/web-console/frontend/app/services/FormUtils.service.js
index da6b417..2c81c57 100644
--- a/modules/web-console/frontend/app/services/FormUtils.service.js
+++ b/modules/web-console/frontend/app/services/FormUtils.service.js
@@ -329,12 +329,19 @@ export default
