incubator-ignite git commit: IGNITE-843 Fixed collapse/expand advanced options. WIP on metadata screen.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 faba28980 -> cb92fea18
IGNITE-843 Fixed collapse/expand advanced options. WIP on metadata screen.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cb92fea1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cb92fea1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cb92fea1
Branch: refs/heads/ignite-843
Commit: cb92fea18e4c642932ef342c0eaff31e8da5a137
Parents: faba289
Author: AKuznetsov
Authored: Mon Aug 10 10:46:40 2015 +0700
Committer: AKuznetsov
Committed: Mon Aug 10 10:46:40 2015 +0700
--
.../main/js/controllers/caches-controller.js| 6 +
.../main/js/controllers/clusters-controller.js | 6 +
.../main/js/controllers/metadata-controller.js | 4 +-
.../main/js/controllers/models/metadata.json| 314 ++-
.../src/main/js/public/stylesheets/style.scss | 22 +-
.../src/main/js/views/configuration/caches.jade | 45 ++-
.../main/js/views/configuration/clusters.jade | 45 ++-
.../main/js/views/configuration/metadata.jade | 50 +--
.../src/main/js/views/includes/controls.jade| 16 +-
9 files changed, 246 insertions(+), 262 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb92fea1/modules/control-center-web/src/main/js/controllers/caches-controller.js
--
diff --git
a/modules/control-center-web/src/main/js/controllers/caches-controller.js
b/modules/control-center-web/src/main/js/controllers/caches-controller.js
index 942fb8e..9d9d582 100644
--- a/modules/control-center-web/src/main/js/controllers/caches-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js
@@ -88,6 +88,12 @@ controlCenterModule.controller('cachesController',
['$scope', '$http', '$common'
{value: 'H2', label: 'H2 database'}
];
+$scope.ui = {expanded: false};
+
+$scope.toggleExpanded = function () {
+$scope.ui.expanded = !$scope.ui.expanded;
+};
+
$scope.general = [];
$scope.advanced = [];
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb92fea1/modules/control-center-web/src/main/js/controllers/clusters-controller.js
--
diff --git
a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index 2cdd1ab..d962f52 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -97,6 +97,12 @@ controlCenterModule.controller('clustersController',
['$scope', '$http', '$commo
{value: 'JdkMarshaller', label: 'JdkMarshaller'}
];
+$scope.ui = {expanded: false};
+
+$scope.toggleExpanded = function () {
+$scope.ui.expanded = !$scope.ui.expanded;
+};
+
var simpleTables = {
addresses: {msg: 'Such IP address already exists!', id:
'IpAddress'},
regions: {msg: 'Such region already exists!', id: 'Region'},
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb92fea1/modules/control-center-web/src/main/js/controllers/metadata-controller.js
--
diff --git
a/modules/control-center-web/src/main/js/controllers/metadata-controller.js
b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
index ba72b17..b6eaaab 100644
--- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
@@ -307,7 +307,7 @@ controlCenterModule.controller('metadataController', [
.success(function (data) {
$scope.screenTip = data.screenTip;
$scope.templateTip = data.templateTip;
-$scope.metadataManual = data.metadataManual;
+$scope.metadata = data.metadata;
$scope.metadataDb = data.metadataDb;
})
.error(function (errMsg) {
@@ -324,8 +324,6 @@ controlCenterModule.controller('metadataController', [
$scope.selectedItem = sel;
$scope.backupItem = bak;
-
-$scope.panels.activePanel = [0];
}
// When landing on the page, get metadatas and show them.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb92fea1/modules/control-center-web/src/main/js/controllers/models/metadata.json
-
[02/39] incubator-ignite git commit: ignite-support804 - switched to a system pool
ignite-support804 - switched to a system pool
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/23377fe0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/23377fe0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/23377fe0
Branch: refs/heads/ignite-946
Commit: 23377fe02157c749d64941f0ce1dcd58c8445d04
Parents: 77e3976
Author: S.Vladykin
Authored: Thu Jul 30 11:51:34 2015 +0300
Committer: S.Vladykin
Committed: Thu Jul 30 11:51:34 2015 +0300
--
.../processors/query/h2/twostep/GridMapQueryExecutor.java | 7 ---
.../processors/query/h2/twostep/GridReduceQueryExecutor.java | 7 +--
2 files changed, 9 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23377fe0/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
index 0f38353..6ab1a1b 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
@@ -50,6 +50,7 @@ import java.util.concurrent.atomic.*;
import static org.apache.ignite.events.EventType.*;
import static
org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion.*;
import static
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.*;
+import static
org.apache.ignite.internal.processors.query.h2.twostep.GridReduceQueryExecutor.*;
import static
org.apache.ignite.internal.processors.query.h2.twostep.msg.GridH2ValueMessageFactory.*;
/**
@@ -495,7 +496,7 @@ public class GridMapQueryExecutor {
if (node.isLocal())
h2.reduceQueryExecutor().onMessage(ctx.localNodeId(), msg);
else
-ctx.io().send(node, GridTopic.TOPIC_QUERY, msg,
GridIoPolicy.PUBLIC_POOL);
+ctx.io().send(node, GridTopic.TOPIC_QUERY, msg, QUERY_POOL);
}
catch (Exception e) {
e.addSuppressed(err);
@@ -556,7 +557,7 @@ public class GridMapQueryExecutor {
if (loc)
h2.reduceQueryExecutor().onMessage(ctx.localNodeId(), msg);
else
-ctx.io().send(node, GridTopic.TOPIC_QUERY, msg,
GridIoPolicy.PUBLIC_POOL);
+ctx.io().send(node, GridTopic.TOPIC_QUERY, msg, QUERY_POOL);
}
catch (IgniteCheckedException e) {
log.error("Failed to send message.", e);
@@ -583,7 +584,7 @@ public class GridMapQueryExecutor {
if (loc)
h2.reduceQueryExecutor().onMessage(ctx.localNodeId(), msg);
else
-ctx.io().send(node, GridTopic.TOPIC_QUERY, msg,
GridIoPolicy.PUBLIC_POOL);
+ctx.io().send(node, GridTopic.TOPIC_QUERY, msg, QUERY_POOL);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23377fe0/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index 32d1c95..ffa2bc0 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@ -63,6 +63,9 @@ import static
org.apache.ignite.internal.processors.affinity.AffinityTopologyVer
* Reduce query executor.
*/
public class GridReduceQueryExecutor {
+/** Thread pool to process query messages. */
+public static final byte QUERY_POOL = GridIoPolicy.SYSTEM_POOL;
+
/** */
private GridKernalContext ctx;
@@ -248,7 +251,7 @@ public class GridReduceQueryExecutor {
if (node.isLocal())
h2.mapQueryExecutor().onMessage(ctx.localNodeId(),
msg0);
else
-ctx.io().send(node, GridTopic.TOPIC_QUERY, msg0,
GridIoPolicy.PUBLIC_POOL);
+ctx.io().send(node, GridTopic.TOPIC_QUERY, msg0,
QUERY_POOL);
}
[08/39] incubator-ignite git commit: IGNITE-1185 Fix javadoc. (cherry picked from commit 3c19212)
IGNITE-1185 Fix javadoc.
(cherry picked from commit 3c19212)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b0dd9320
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b0dd9320
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b0dd9320
Branch: refs/heads/ignite-946
Commit: b0dd9320f26af01a67f27842bf501049bac43665
Parents: c66a877
Author: sevdokimov
Authored: Mon Aug 3 14:11:58 2015 +0300
Committer: sevdokimov
Committed: Mon Aug 3 14:15:33 2015 +0300
--
.../src/main/java/org/apache/ignite/internal/util/IgniteUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0dd9320/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index ee07743..3366256 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -3321,7 +3321,7 @@ public abstract class IgniteUtils {
/**
* @param path Resource path.
- * @return Resource URL inside jar. Or {@code null}.
+ * @return Resource URL inside classpath or {@code null}.
*/
@Nullable private static URL resolveInClasspath(String path) {
ClassLoader clsLdr = Thread.currentThread().getContextClassLoader();
[22/39] incubator-ignite git commit: Merge branch 'ignite-1.3.3'
Merge branch 'ignite-1.3.3' Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/44aaceca Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/44aaceca Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/44aaceca Branch: refs/heads/ignite-946 Commit: 44aaceca596f5d4b738f9da8d12e9af4e0431379 Parents: c087be2 7d747d2 Author: vozerov-gridgain Authored: Wed Aug 5 11:27:50 2015 +0300 Committer: vozerov-gridgain Committed: Wed Aug 5 11:27:50 2015 +0300 -- .../processors/cache/GridCacheProcessor.java| 10 +++- .../processors/cache/GridCacheUtils.java| 1 - .../ignite/internal/util/GridLogThrottle.java | 63 +++- .../ignite/spi/discovery/tcp/ClientImpl.java| 5 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 5 +- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 15 + .../query/h2/twostep/GridMapQueryExecutor.java | 7 ++- .../h2/twostep/GridReduceQueryExecutor.java | 7 ++- 8 files changed, 87 insertions(+), 26 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44aaceca/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44aaceca/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44aaceca/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44aaceca/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44aaceca/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44aaceca/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java --
[11/39] incubator-ignite git commit: Merge branches 'ignite-1.3.3' and 'ignite-support804' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-support804
Merge branches 'ignite-1.3.3' and 'ignite-support804' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-support804 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/015d9cd5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/015d9cd5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/015d9cd5 Branch: refs/heads/ignite-946 Commit: 015d9cd5397d9d24489cfe757df36192b83ebcfe Parents: 23377fe 12cbe22 Author: S.Vladykin Authored: Mon Aug 3 15:12:10 2015 +0300 Committer: S.Vladykin Committed: Mon Aug 3 15:12:10 2015 +0300 -- .../apache/ignite/IgniteSystemProperties.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 17 +--- .../processors/cache/GridCacheProcessor.java| 10 - .../processors/cache/GridCacheUtils.java| 1 - .../ignite/internal/util/IgniteUtils.java | 16 .../parser/dialect/OracleMetadataDialect.java | 4 +- .../src/test/java/config/ignite-test-config.xml | 43 .../ignite/internal/GridFactorySelfTest.java| 9 8 files changed, 80 insertions(+), 22 deletions(-) --
[01/39] incubator-ignite git commit: IGNITE-1157 Fix.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-946 53557e327 -> 9f16eb165
IGNITE-1157 Fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/45aa5985
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/45aa5985
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/45aa5985
Branch: refs/heads/ignite-946
Commit: 45aa5985bfe0ca3b9a537f9b7ef2136a64d97d28
Parents: 32f84c1
Author: sevdokimov
Authored: Fri Jul 24 18:44:46 2015 +0300
Committer: sevdokimov
Committed: Fri Jul 24 18:44:46 2015 +0300
--
.../ignite/internal/util/GridLogThrottle.java | 53 +---
.../ignite/spi/discovery/tcp/ClientImpl.java| 5 +-
.../ignite/spi/discovery/tcp/ServerImpl.java| 5 +-
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 15 ++
4 files changed, 57 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45aa5985/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
index 89b02b4..f37cfea 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
@@ -18,9 +18,9 @@
package org.apache.ignite.internal.util;
import org.apache.ignite.*;
+import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
import org.jetbrains.annotations.*;
import org.jsr166.*;
@@ -42,7 +42,7 @@ public class GridLogThrottle {
private static int throttleTimeout = DFLT_THROTTLE_TIMEOUT;
/** Errors. */
-private static final ConcurrentMap, String>, Long> errors =
+private static final ConcurrentMap,
String, Boolean>, Long> errors =
new ConcurrentHashMap8<>();
/**
@@ -73,7 +73,7 @@ public class GridLogThrottle {
public static void error(@Nullable IgniteLogger log, @Nullable Throwable
e, String msg) {
assert !F.isEmpty(msg);
-log(log, e, msg, null, LogLevel.ERROR);
+log(log, e, msg, null, LogLevel.ERROR, false);
}
/**
@@ -86,7 +86,20 @@ public class GridLogThrottle {
public static void warn(@Nullable IgniteLogger log, @Nullable Throwable e,
String msg) {
assert !F.isEmpty(msg);
-log(log, e, msg, null, LogLevel.WARN);
+log(log, e, msg, null, LogLevel.WARN, false);
+}
+
+/**
+ * Logs warning if needed.
+ *
+ * @param log Logger.
+ * @param e Error (optional).
+ * @param msg Message.
+ */
+public static void warn(@Nullable IgniteLogger log, @Nullable Throwable e,
String msg, boolean quite) {
+assert !F.isEmpty(msg);
+
+log(log, e, msg, null, LogLevel.WARN, quite);
}
/**
@@ -100,7 +113,7 @@ public class GridLogThrottle {
public static void warn(@Nullable IgniteLogger log, @Nullable Throwable e,
String longMsg, @Nullable String shortMsg) {
assert !F.isEmpty(longMsg);
-log(log, e, longMsg, shortMsg, LogLevel.WARN);
+log(log, e, longMsg, shortMsg, LogLevel.WARN, false);
}
/**
@@ -112,7 +125,7 @@ public class GridLogThrottle {
public static void info(@Nullable IgniteLogger log, String msg) {
assert !F.isEmpty(msg);
-log(log, null, msg, null, LogLevel.INFO);
+log(log, null, msg, null, LogLevel.INFO, false);
}
/**
@@ -133,12 +146,12 @@ public class GridLogThrottle {
*/
@SuppressWarnings({"RedundantTypeArguments"})
private static void log(@Nullable IgniteLogger log, @Nullable Throwable e,
String longMsg, @Nullable String shortMsg,
-LogLevel level) {
+LogLevel level, boolean quiet) {
assert !F.isEmpty(longMsg);
-IgniteBiTuple, String> tup =
-e != null ? F., String>t(e.getClass(),
e.getMessage()) :
-F., String>t(null, longMsg);
+GridTuple3, String, Boolean> tup =
+e != null ? F., String,
Boolean>t(e.getClass(), e.getMessage(), quiet) :
+F., String, Boolean>t(null,
longMsg, quiet);
while (true) {
Long loggedTs = errors.get(tup);
@@ -147,7 +160,7 @@ public class GridLogThrottle {
if (loggedTs == null || loggedTs < curTs - throttleTimeout) {
if (replace(tup, loggedTs, curTs)) {
-level.doLog(log, longMsg, shortMsg, e);
+level.doLog(
[16/39] incubator-ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/38810b63 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/38810b63 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/38810b63 Branch: refs/heads/ignite-946 Commit: 38810b639fbcf6f5a07302f02c48226f4156de9d Parents: e1f0152 52c1dfa Author: S.Vladykin Authored: Tue Aug 4 17:52:08 2015 +0300 Committer: S.Vladykin Committed: Tue Aug 4 17:52:08 2015 +0300 -- .../yardstick/config/benchmark-query.properties | 3 +- modules/yardstick/config/ignite-base-config.xml | 2 - .../yardstick/IgniteBenchmarkArguments.java | 11 ++ .../cache/IgniteJdbcSqlQueryBenchmark.java | 134 +++ 4 files changed, 147 insertions(+), 3 deletions(-) --
[09/39] incubator-ignite git commit: IGNITE-1172 Fixed review notes.
IGNITE-1172 Fixed review notes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3ace82ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3ace82ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3ace82ac
Branch: refs/heads/ignite-946
Commit: 3ace82ac5ea85da5cd0883eb4da794f0609a8218
Parents: 4ba8b6f
Author: nikolay_tikhonov
Authored: Mon Aug 3 14:22:08 2015 +0300
Committer: nikolay_tikhonov
Committed: Mon Aug 3 14:22:08 2015 +0300
--
.../ignite/internal/processors/cache/GridCacheProcessor.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ace82ac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index a83fd4c..8e2b20e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -497,8 +497,8 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
cleanup(cfg, cfg.getAffinityMapper(), false);
cleanup(cfg, cctx.store().configuredStore(), false);
-if (!CU.isUtilityCache(cctx.cache().name()) &&
!CU.isSystemCache(cctx.cache().name()))
-unregisterMbean(cctx.cache().mxBean(),
U.maskName(cctx.cache().name()) + "_" + ctx.gridName(), false);
+if (!CU.isUtilityCache(cfg.getName()) &&
!CU.isSystemCache(cfg.getName()))
+unregisterMbean(cctx.cache().mxBean(), cfg.getName(), false);
NearCacheConfiguration nearCfg = cfg.getNearConfiguration();
@@ -1360,7 +1360,7 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
}
if (!CU.isUtilityCache(cache.name()) &&
!CU.isSystemCache(cache.name()))
-registerMbean(cache.mxBean(), U.maskName(cache.name()) + "_" +
ctx.gridName(), false);
+registerMbean(cache.mxBean(), cache.name(), false);
return ret;
}
[21/39] incubator-ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c087be21 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c087be21 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c087be21 Branch: refs/heads/ignite-946 Commit: c087be21760dd8ab34a0b2a43f7f10f7a5203e41 Parents: b683b8f 01c3e09 Author: S.Vladykin Authored: Wed Aug 5 00:27:37 2015 +0300 Committer: S.Vladykin Committed: Wed Aug 5 00:27:37 2015 +0300 -- .../internal/processors/cache/GridCacheSwapPreloadSelfTest.java| 2 ++ 1 file changed, 2 insertions(+) --
[15/39] incubator-ignite git commit: master - test fix
master - test fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e1f01529
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e1f01529
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e1f01529
Branch: refs/heads/ignite-946
Commit: e1f01529fa9d19641cb276551375cd8bd739da6d
Parents: b056a73
Author: S.Vladykin
Authored: Tue Aug 4 17:51:40 2015 +0300
Committer: S.Vladykin
Committed: Tue Aug 4 17:51:40 2015 +0300
--
...idCacheReduceQueryMultithreadedSelfTest.java | 21 +++-
1 file changed, 20 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e1f01529/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
index c3290a6..f890dee 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
@@ -21,6 +21,9 @@ import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.query.*;
import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import java.util.*;
import java.util.concurrent.*;
@@ -39,6 +42,9 @@ public class GridCacheReduceQueryMultithreadedSelfTest
extends GridCacheAbstract
/** */
private static final int TEST_TIMEOUT = 2 * 60 * 1000;
+/** */
+private static final TcpDiscoveryIpFinder ipFinder = new
TcpDiscoveryVmIpFinder(true);
+
/** {@inheritDoc} */
@Override protected int gridCount() {
return GRID_CNT;
@@ -50,8 +56,21 @@ public class GridCacheReduceQueryMultithreadedSelfTest
extends GridCacheAbstract
}
/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+TcpDiscoverySpi disco = new TcpDiscoverySpi();
+
+disco.setIpFinder(ipFinder);
+
+cfg.setDiscoverySpi(disco);
+
+return cfg;
+}
+
+/** {@inheritDoc} */
@Override protected CacheConfiguration cacheConfiguration(String gridName)
throws Exception {
-CacheConfiguration cfg = super.cacheConfiguration(gridName);
+CacheConfiguration cfg = super.cacheConfiguration(gridName);
cfg.setCacheMode(PARTITIONED);
cfg.setBackups(1);
[07/39] incubator-ignite git commit: IGNITE-1185 Locate configuration in class path: Add tests. (cherry picked from commit 79f27f4)
IGNITE-1185 Locate configuration in class path: Add tests.
(cherry picked from commit 79f27f4)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c66a877a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c66a877a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c66a877a
Branch: refs/heads/ignite-946
Commit: c66a877ad5cacfca310341e7301d7e2e96d6c6dc
Parents: 754da7a
Author: sevdokimov
Authored: Mon Aug 3 13:46:40 2015 +0300
Committer: sevdokimov
Committed: Mon Aug 3 14:15:26 2015 +0300
--
.../src/test/java/config/ignite-test-config.xml | 43
.../ignite/internal/GridFactorySelfTest.java| 9
2 files changed, 52 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c66a877a/modules/spring/src/test/java/config/ignite-test-config.xml
--
diff --git a/modules/spring/src/test/java/config/ignite-test-config.xml
b/modules/spring/src/test/java/config/ignite-test-config.xml
new file mode 100644
index 000..145d124
--- /dev/null
+++ b/modules/spring/src/test/java/config/ignite-test-config.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+http://www.springframework.org/schema/beans/spring-beans.xsd";>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c66a877a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
--
diff --git
a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
index ecc7fb7..fb8cbfe 100644
---
a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
+++
b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
@@ -824,6 +824,15 @@ public class GridFactorySelfTest extends
GridCommonAbstractTest {
}
/**
+ * @throws Exception If failed.
+ */
+public void testConfigInClassPath() throws Exception {
+try (Ignite ignite = Ignition.start("config/ignite-test-config.xml")) {
+assert "config-in-classpath".equals(ignite.name());
+}
+}
+
+/**
* Test task.
*/
private static class TestTask extends ComputeTaskSplitAdapter {
[06/39] incubator-ignite git commit: IGNITE-1185 Locate configuration in class path. (cherry picked from commit 518b623)
IGNITE-1185 Locate configuration in class path.
(cherry picked from commit 518b623)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/754da7a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/754da7a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/754da7a1
Branch: refs/heads/ignite-946
Commit: 754da7a19b8d645c6497b2cdfee320cb922990fc
Parents: 41c76a7
Author: sevdokimov
Authored: Mon Aug 3 12:48:35 2015 +0300
Committer: sevdokimov
Committed: Mon Aug 3 14:15:19 2015 +0300
--
.../org/apache/ignite/internal/IgnitionEx.java | 17 +
.../apache/ignite/internal/util/IgniteUtils.java | 16
2 files changed, 17 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/754da7a1/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 73de99a..3790703 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -583,22 +583,7 @@ public class IgnitionEx {
public static IgniteBiTuple, ? extends
GridSpringResourceContext>
loadConfigurations(String springCfgPath) throws IgniteCheckedException {
A.notNull(springCfgPath, "springCfgPath");
-
-URL url;
-
-try {
-url = new URL(springCfgPath);
-}
-catch (MalformedURLException e) {
-url = U.resolveIgniteUrl(springCfgPath);
-
-if (url == null)
-throw new IgniteCheckedException("Spring XML configuration
path is invalid: " + springCfgPath +
-". Note that this path should be either absolute or a
relative local file system path, " +
-"relative to META-INF in classpath or valid URL to
IGNITE_HOME.", e);
-}
-
-return loadConfigurations(url);
+return loadConfigurations(IgniteUtils.resolveSpringUrl(springCfgPath));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/754da7a1/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 6bd361f..ee07743 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -3308,6 +3308,9 @@ public abstract class IgniteUtils {
url = U.resolveIgniteUrl(springCfgPath);
if (url == null)
+url = resolveInClasspath(springCfgPath);
+
+if (url == null)
throw new IgniteCheckedException("Spring XML configuration
path is invalid: " + springCfgPath +
". Note that this path should be either absolute or a
relative local file system path, " +
"relative to META-INF in classpath or valid URL to
IGNITE_HOME.", e);
@@ -3317,6 +3320,19 @@ public abstract class IgniteUtils {
}
/**
+ * @param path Resource path.
+ * @return Resource URL inside jar. Or {@code null}.
+ */
+@Nullable private static URL resolveInClasspath(String path) {
+ClassLoader clsLdr = Thread.currentThread().getContextClassLoader();
+
+if (clsLdr == null)
+return null;
+
+return clsLdr.getResource(path.replaceAll("", "/"));
+}
+
+/**
* Gets URL representing the path passed in. First the check is made if
path is absolute.
* If not, then the check is made if path is relative to {@code META-INF}
folder in classpath.
* If not, then the check is made if path is relative to ${IGNITE_HOME}.
[03/39] incubator-ignite git commit: IGNITE-1172 CacheMetricsMBeans registered/unregistred on start/stop cache.
IGNITE-1172 CacheMetricsMBeans registered/unregistred on start/stop cache.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/83d7b273
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/83d7b273
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/83d7b273
Branch: refs/heads/ignite-946
Commit: 83d7b2734db4a418e05de730d8ca9c773ba8766c
Parents: f82fb5c
Author: nikolay_tikhonov
Authored: Fri Jul 31 19:27:16 2015 +0300
Committer: nikolay_tikhonov
Committed: Fri Jul 31 18:33:02 2015 +0300
--
.../internal/processors/cache/GridCacheProcessor.java | 10 --
.../ignite/internal/processors/cache/GridCacheUtils.java | 1 -
2 files changed, 8 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83d7b273/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index bb87a86..77d41f8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -497,6 +497,9 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
cleanup(cfg, cfg.getAffinityMapper(), false);
cleanup(cfg, cctx.store().configuredStore(), false);
+if (!CU.isUtilityCache(cctx.cache().name()) &&
!CU.isSystemCache(cctx.cache().name()))
+cleanup(cfg, cctx.cache().name(), false);
+
NearCacheConfiguration nearCfg = cfg.getNearConfiguration();
if (nearCfg != null)
@@ -1356,6 +1359,9 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
cacheCtx.cache(dht);
}
+if (!CU.isUtilityCache(cache.name()) &&
!CU.isSystemCache(cache.name()))
+prepare(cfg, cache.mxBean(), false);
+
return ret;
}
@@ -2940,7 +2946,7 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
cacheName = near ? cacheName + "-near" : cacheName;
for (Class itf : o.getClass().getInterfaces()) {
-if (itf.getName().endsWith("MBean")) {
+if (itf.getName().endsWith("MBean") ||
itf.getName().endsWith("MXBean")) {
try {
U.registerCacheMBean(srvr, ctx.gridName(), cacheName,
o.getClass().getName(), o,
(Class)itf);
@@ -2973,7 +2979,7 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
cacheName = near ? cacheName + "-near" : cacheName;
for (Class itf : o.getClass().getInterfaces()) {
-if (itf.getName().endsWith("MBean")) {
+if (itf.getName().endsWith("MBean") ||
itf.getName().endsWith("MXBean")) {
try {
srvr.unregisterMBean(U.makeCacheMBeanName(ctx.gridName(),
cacheName, o.getClass().getName()));
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83d7b273/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index f88e288..41e3896 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -57,7 +57,6 @@ import static org.apache.ignite.cache.CacheMode.*;
import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
/**
[17/39] incubator-ignite git commit: master - query restart tests fix
master - query restart tests fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/90adeae9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/90adeae9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/90adeae9
Branch: refs/heads/ignite-946
Commit: 90adeae9dd57f0be5f244d5167853a0b48dc
Parents: 38810b6
Author: S.Vladykin
Authored: Tue Aug 4 20:30:00 2015 +0300
Committer: S.Vladykin
Committed: Tue Aug 4 20:30:00 2015 +0300
--
.../h2/twostep/GridReduceQueryExecutor.java | 34 ++--
1 file changed, 31 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90adeae9/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index cde3288..ac269db 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@ -150,8 +150,7 @@ public class GridReduceQueryExecutor {
for (QueryRun r : runs.values()) {
for (GridMergeTable tbl : r.tbls) {
if (tbl.getScanIndex(null).hasSource(nodeId)) {
-// Will attempt to retry. If reduce query was
started it will fail on next page fetching.
-retry(r, h2.readyTopologyVersion(), nodeId);
+handleNodeLeft(r, nodeId);
break;
}
@@ -162,6 +161,15 @@ public class GridReduceQueryExecutor {
}
/**
+ * @param r Query run.
+ * @param nodeId Left node ID.
+ */
+private void handleNodeLeft(QueryRun r, UUID nodeId) {
+// Will attempt to retry. If reduce query was started it will fail on
next page fetching.
+retry(r, h2.readyTopologyVersion(), nodeId);
+}
+
+/**
* @param nodeId Node ID.
* @param msg Message.
*/
@@ -515,7 +523,7 @@ public class GridReduceQueryExecutor {
if (send(nodes,
new GridQueryRequest(qryReqId, r.pageSize, space, mapQrys,
topVer, extraSpaces, null), partsMap)) {
-U.await(r.latch);
+awaitAllReplies(r, nodes);
Object state = r.state.get();
@@ -595,6 +603,26 @@ public class GridReduceQueryExecutor {
}
/**
+ * @param r Query run.
+ * @param nodes Nodes to check periodically if they alive.
+ * @throws IgniteInterruptedCheckedException If interrupted.
+ */
+private void awaitAllReplies(QueryRun r, Collection nodes)
+throws IgniteInterruptedCheckedException {
+while (!U.await(r.latch, 500, TimeUnit.MILLISECONDS)) {
+for (ClusterNode node : nodes) {
+if (!ctx.discovery().alive(node)) {
+handleNodeLeft(r, node.id());
+
+assert r.latch.getCount() == 0;
+
+return;
+}
+}
+}
+}
+
+/**
* Calculates data nodes for replicated caches on unstable topology.
*
* @param cctx Cache context for main space.
[04/39] incubator-ignite git commit: IGNITE-1172 CacheMetricsMBeans registered/unregistred on start/stop cache.
IGNITE-1172 CacheMetricsMBeans registered/unregistred on start/stop cache.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9389c6e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9389c6e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9389c6e3
Branch: refs/heads/ignite-946
Commit: 9389c6e3ed79e5b9800b5aec076fbfee843c38ec
Parents: 83d7b27
Author: nikolay_tikhonov
Authored: Mon Aug 3 12:12:49 2015 +0300
Committer: nikolay_tikhonov
Committed: Mon Aug 3 12:12:49 2015 +0300
--
.../ignite/internal/processors/cache/GridCacheProcessor.java| 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9389c6e3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 77d41f8..fc6054b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -497,7 +497,8 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
cleanup(cfg, cfg.getAffinityMapper(), false);
cleanup(cfg, cctx.store().configuredStore(), false);
-if (!CU.isUtilityCache(cctx.cache().name()) &&
!CU.isSystemCache(cctx.cache().name()))
+if (cfg.isStatisticsEnabled() &&
!CU.isUtilityCache(cctx.cache().name())
+&& !CU.isSystemCache(cctx.cache().name()))
cleanup(cfg, cctx.cache().name(), false);
NearCacheConfiguration nearCfg = cfg.getNearConfiguration();
@@ -1359,7 +1360,7 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
cacheCtx.cache(dht);
}
-if (!CU.isUtilityCache(cache.name()) &&
!CU.isSystemCache(cache.name()))
+if (cfg.isStatisticsEnabled() && !CU.isUtilityCache(cache.name()) &&
!CU.isSystemCache(cache.name()))
prepare(cfg, cache.mxBean(), false);
return ret;
[12/39] incubator-ignite git commit: IGNITE-1157 Fix problems found on review.
IGNITE-1157 Fix problems found on review.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a1543cfe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a1543cfe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a1543cfe
Branch: refs/heads/ignite-946
Commit: a1543cfe4ce435adcc08e3680d19da8b63a3d945
Parents: 45aa598
Author: sevdokimov
Authored: Mon Aug 3 15:22:27 2015 +0300
Committer: sevdokimov
Committed: Mon Aug 3 15:22:27 2015 +0300
--
.../ignite/internal/util/GridLogThrottle.java | 36 ++--
1 file changed, 26 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1543cfe/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
index f37cfea..607b17b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
@@ -18,9 +18,9 @@
package org.apache.ignite.internal.util;
import org.apache.ignite.*;
-import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
import org.jetbrains.annotations.*;
import org.jsr166.*;
@@ -42,7 +42,7 @@ public class GridLogThrottle {
private static int throttleTimeout = DFLT_THROTTLE_TIMEOUT;
/** Errors. */
-private static final ConcurrentMap,
String, Boolean>, Long> errors =
+private static final ConcurrentMap, String>, Long> errors =
new ConcurrentHashMap8<>();
/**
@@ -95,6 +95,7 @@ public class GridLogThrottle {
* @param log Logger.
* @param e Error (optional).
* @param msg Message.
+ * @param quite Print warning anyway.
*/
public static void warn(@Nullable IgniteLogger log, @Nullable Throwable e,
String msg, boolean quite) {
assert !F.isEmpty(msg);
@@ -121,11 +122,22 @@ public class GridLogThrottle {
*
* @param log Logger.
* @param msg Message.
+ * @param quite Print info anyway.
*/
-public static void info(@Nullable IgniteLogger log, String msg) {
+public static void info(@Nullable IgniteLogger log, String msg, boolean
quite) {
assert !F.isEmpty(msg);
-log(log, null, msg, null, LogLevel.INFO, false);
+log(log, null, msg, null, LogLevel.INFO, quite);
+}
+
+/**
+ * Logs info if needed.
+ *
+ * @param log Logger.
+ * @param msg Message.
+ */
+public static void info(@Nullable IgniteLogger log, String msg) {
+info(log, msg, false);
}
/**
@@ -149,9 +161,9 @@ public class GridLogThrottle {
LogLevel level, boolean quiet) {
assert !F.isEmpty(longMsg);
-GridTuple3, String, Boolean> tup =
-e != null ? F., String,
Boolean>t(e.getClass(), e.getMessage(), quiet) :
-F., String, Boolean>t(null,
longMsg, quiet);
+IgniteBiTuple, String> tup =
+e != null ? F., String>t(e.getClass(),
e.getMessage()) :
+F., String>t(null, longMsg);
while (true) {
Long loggedTs = errors.get(tup);
@@ -177,7 +189,7 @@ public class GridLogThrottle {
* @param newStamp New timestamp.
* @return {@code True} if throttle value was replaced.
*/
-private static boolean replace(GridTuple3,
String, Boolean> t, @Nullable Long oldStamp,
+private static boolean replace(IgniteBiTuple,
String> t, @Nullable Long oldStamp,
Long newStamp) {
assert newStamp != null;
@@ -222,8 +234,12 @@ public class GridLogThrottle {
/** Info level. */
INFO {
@Override public void doLog(IgniteLogger log, String longMsg,
String shortMsg, Throwable e, boolean quiet) {
-if (log.isInfoEnabled())
-log.info(longMsg);
+if (quiet)
+U.quietAndInfo(log, longMsg);
+else {
+if (log.isInfoEnabled())
+log.info(longMsg);
+}
}
};
[18/39] incubator-ignite git commit: master - query restart tests fix2
master - query restart tests fix2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/246b94a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/246b94a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/246b94a8
Branch: refs/heads/ignite-946
Commit: 246b94a8bdc9901935db1865a0607a9fe48f5b23
Parents: 90adeae
Author: S.Vladykin
Authored: Tue Aug 4 21:05:13 2015 +0300
Committer: S.Vladykin
Committed: Tue Aug 4 21:05:13 2015 +0300
--
.../query/h2/twostep/GridMergeIndex.java| 7 +++
.../h2/twostep/GridMergeIndexUnsorted.java | 23 +++--
.../query/h2/twostep/GridMergeTable.java| 51
.../h2/twostep/GridReduceQueryExecutor.java | 28 +--
4 files changed, 45 insertions(+), 64 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/246b94a8/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
index 2b2996d..71b207d 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
@@ -68,6 +68,13 @@ public abstract class GridMergeIndex extends BaseIndex {
}
/**
+ * @return Return source nodes for this merge index.
+ */
+public Set sources() {
+return remainingRows.keySet();
+}
+
+/**
* @param nodeId Node ID.
* @return {@code true} If this index needs data from the given source
node.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/246b94a8/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexUnsorted.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexUnsorted.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexUnsorted.java
index e0a07ec..276d25b 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexUnsorted.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexUnsorted.java
@@ -64,11 +64,24 @@ public class GridMergeIndexUnsorted extends GridMergeIndex {
while (!iter.hasNext()) {
GridResultPage page;
-try {
-page = queue.take();
-}
-catch (InterruptedException e) {
-throw new CacheException("Query execution was
interrupted.", e);
+for (;;) {
+try {
+page = queue.poll(500, TimeUnit.MILLISECONDS);
+}
+catch (InterruptedException e) {
+throw new CacheException("Query execution was
interrupted.", e);
+}
+
+if (page != null)
+break;
+
+UUID nodeId =
((GridMergeTable)table).checkSourceNodesAlive();
+
+if (nodeId != null) {
+fail(nodeId);
+
+assert !queue.isEmpty();
+}
}
if (page.isLast())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/246b94a8/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeTable.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeTable.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeTable.java
index c9cdff2..fd9eec3 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeTable.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeTable.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.processors.query.h2.twostep;
-import org.h2.api.*;
+import org.apache.ignite.internal.*;
import org.h2.command.ddl.*;
import org.h2.engine.*;
[19/39] incubator-ignite git commit: # Muted hanging test
# Muted hanging test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/01c3e092
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/01c3e092
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/01c3e092
Branch: refs/heads/ignite-946
Commit: 01c3e0928fbba8d1dfa24b97d4e2506816472703
Parents: 246b94a
Author: Valentin Kulichenko
Authored: Tue Aug 4 11:25:48 2015 -0700
Committer: Valentin Kulichenko
Committed: Tue Aug 4 11:25:48 2015 -0700
--
.../internal/processors/cache/GridCacheSwapPreloadSelfTest.java| 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01c3e092/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
index 6176da4..f8e1bff 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
@@ -153,6 +153,8 @@ public class GridCacheSwapPreloadSelfTest extends
GridCommonAbstractTest {
/** @throws Exception If failed. */
private void checkSwapMultithreaded() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-614";);
+
final AtomicBoolean done = new AtomicBoolean();
IgniteInternalFuture fut = null;
incubator-ignite git commit: IGNITE-843 Cleanup of focus directives.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 72347f80f -> faba28980
IGNITE-843 Cleanup of focus directives.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/faba2898
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/faba2898
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/faba2898
Branch: refs/heads/ignite-843
Commit: faba28980a3531c3a60dd2d8c687b7289f67ccd3
Parents: 72347f8
Author: AKuznetsov
Authored: Mon Aug 10 09:17:35 2015 +0700
Committer: AKuznetsov
Committed: Mon Aug 10 09:17:35 2015 +0700
--
.../src/main/js/controllers/common-module.js| 8 +++---
.../src/main/js/views/configuration/caches.jade | 4 +--
.../main/js/views/configuration/clusters.jade | 4 +--
.../main/js/views/configuration/metadata.jade | 4 +--
.../src/main/js/views/includes/controls.jade| 28 ++--
.../src/main/js/views/login.jade| 14 +-
.../src/main/js/views/reset.jade| 2 +-
7 files changed, 32 insertions(+), 32 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/faba2898/modules/control-center-web/src/main/js/controllers/common-module.js
--
diff --git
a/modules/control-center-web/src/main/js/controllers/common-module.js
b/modules/control-center-web/src/main/js/controllers/common-module.js
index 6015cc5..55106aa 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -570,7 +570,7 @@ controlCenterModule.directive('enterFocusNext', function
($focus) {
if (event.which === 13) {
event.preventDefault();
-$focus(attrs.enterFocusNextId);
+$focus(attrs.enterFocusNext);
}
});
};
@@ -579,13 +579,13 @@ controlCenterModule.directive('enterFocusNext', function
($focus) {
// Directive to mark elements to focus.
controlCenterModule.directive('eventFocus', function ($focus) {
return function (scope, elem, attr) {
-elem.on(attr.eventFocus, function () {
-$focus(attr.eventFocusId);
+elem.on('click', function () {
+$focus(attr.eventFocus);
});
// Removes bound events in the element itself when the scope is
destroyed
scope.$on('$destroy', function () {
-elem.off(attr.eventFocus);
+elem.off('click');
});
};
});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/faba2898/modules/control-center-web/src/main/js/views/configuration/caches.jade
--
diff --git
a/modules/control-center-web/src/main/js/views/configuration/caches.jade
b/modules/control-center-web/src/main/js/views/configuration/caches.jade
index 696e7d4..dda7b40 100644
--- a/modules/control-center-web/src/main/js/views/configuration/caches.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/caches.jade
@@ -34,9 +34,9 @@ block content
tbody
tr(ng-repeat='row in caches track by row._id')
td(ng-class='{active: row._id ==
selectedItem._id}')
-a(event-focus='click'
event-focus-id='defaultFocusId' ng-click='selectItem(row)') {{$index + 1}})
{{row.name}}, {{row.mode | displayValue:modes:'Cache mode not set'}},
{{row.atomicityMode | displayValue:atomicities:'Cache atomicity not set'}}
+a(event-focus='defaultFocusId'
ng-click='selectItem(row)') {{$index + 1}}) {{row.name}}, {{row.mode |
displayValue:modes:'Cache mode not set'}}, {{row.atomicityMode |
displayValue:atomicities:'Cache atomicity not set'}}
.padding-top-dflt
-button.btn.btn-primary(event-focus='click'
event-focus-id='defaultFocusId' ng-click='createItem()') Add cache
+button.btn.btn-primary(event-focus='defaultFocusId'
ng-click='createItem()') Add cache
hr
form.form-horizontal(name='inputForm' ng-if='backupItem' novalidate)
div(bs-collapse data-start-collapsed='false')
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/faba2898/modules/control-center-web/src/main/js/views/configuration/clusters.jade
--
diff --git
a/modules/control-center-web/src/main/js/views/configuration/clusters.jade
b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
index d2e05ce..344b08b 100644
--- a/modules/control-center-web/src/main/js/views/configuration/clusters.jade
+++ b/modules/control-c
