ignite git commit: IGNITE-6926) Web console: Fixed SimpleWorkerPool next worker selection logic.

2017-11-15 Thread akuznetsov 
Repository: ignite
Updated Branches:
  refs/heads/master 63b628da4 -> 50b384bfa


IGNITE-6926) Web console: Fixed SimpleWorkerPool next worker selection logic.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/50b384bf
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/50b384bf
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/50b384bf

Branch: refs/heads/master
Commit: 50b384bfa2a68289326fbee093f52c9b5193b7ff
Parents: 63b628d
Author: Alexey Kuznetsov 
Authored: Thu Nov 16 10:12:24 2017 +0700
Committer: Alexey Kuznetsov 
Committed: Thu Nov 16 10:12:24 2017 +0700

--
 modules/web-console/frontend/app/utils/SimpleWorkerPool.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/50b384bf/modules/web-console/frontend/app/utils/SimpleWorkerPool.js
--
diff --git a/modules/web-console/frontend/app/utils/SimpleWorkerPool.js 
b/modules/web-console/frontend/app/utils/SimpleWorkerPool.js
index b76dc52..495a4d2 100644
--- a/modules/web-console/frontend/app/utils/SimpleWorkerPool.js
+++ b/modules/web-console/frontend/app/utils/SimpleWorkerPool.js
@@ -65,7 +65,7 @@ export default class SimpleWorkerPool {
 }
 
 _getNextWorker() {
-return this._workers.find((w) => !w.tid);
+return this._workers.find((w) => _.isNil(w.tid));
 }
 
 _getNextTask() {
@@ -106,7 +106,7 @@ export default class SimpleWorkerPool {
 this._tasks.push({tid, data});
 
 if (this.__dbg)
-console.log(`Pool: [name=${this._name}, 
queue=${this._tasks.length}]`);
+console.log(`Pool: [name=${this._name}, tid=${tid}, 
queue=${this._tasks.length}]`);
 
 this._run();

svn commit: r1815390 - /ignite/site/trunk/whatisignite.html

2017-11-15 Thread dmagda 
Author: dmagda
Date: Wed Nov 15 21:56:40 2017
New Revision: 1815390

URL: http://svn.apache.org/viewvc?rev=1815390=rev
Log:
Fixed

Modified:
ignite/site/trunk/whatisignite.html

Modified: ignite/site/trunk/whatisignite.html
URL: 
http://svn.apache.org/viewvc/ignite/site/trunk/whatisignite.html?rev=1815390=1815389=1815390=diff
==
--- ignite/site/trunk/whatisignite.html (original)
+++ ignite/site/trunk/whatisignite.html Wed Nov 15 21:56:40 2017
@@ -56,7 +56,7 @@ under the License.
 Apache 
Ignite is ...
 
 the 
in-memory computing platform
-composed of strongly consistent 
distributed database
+composed of a strongly consistent 
distributed database
 with powerful SQL, 
key-value and processing APIs

svn commit: r1815383 - /ignite/site/trunk/whatisignite.html

2017-11-15 Thread dmagda 
Author: dmagda
Date: Wed Nov 15 21:39:23 2017
New Revision: 1815383

URL: http://svn.apache.org/viewvc?rev=1815383=rev
Log:
Fixed

Modified:
ignite/site/trunk/whatisignite.html

Modified: ignite/site/trunk/whatisignite.html
URL: 
http://svn.apache.org/viewvc/ignite/site/trunk/whatisignite.html?rev=1815383=1815382=1815383=diff
==
--- ignite/site/trunk/whatisignite.html (original)
+++ ignite/site/trunk/whatisignite.html Wed Nov 15 21:39:23 2017
@@ -56,7 +56,7 @@ under the License.
 Apache 
Ignite is ...
 
 the 
in-memory computing platform
-composed of strongly consistent distributed 
database
+composed of strongly consistent 
distributed database
 with powerful SQL, 
key-value and processing APIs

svn commit: r1815382 - /ignite/site/trunk/whatisignite.html

2017-11-15 Thread dmagda 
Author: dmagda
Date: Wed Nov 15 21:36:52 2017
New Revision: 1815382

URL: http://svn.apache.org/viewvc?rev=1815382=rev
Log:
Fixed

Modified:
ignite/site/trunk/whatisignite.html

Modified: ignite/site/trunk/whatisignite.html
URL: 
http://svn.apache.org/viewvc/ignite/site/trunk/whatisignite.html?rev=1815382=1815381=1815382=diff
==
--- ignite/site/trunk/whatisignite.html (original)
+++ ignite/site/trunk/whatisignite.html Wed Nov 15 21:36:52 2017
@@ -56,7 +56,7 @@ under the License.
 Apache 
Ignite is ...
 
 the 
in-memory computing platform
-that is durable, strongly 
consistent, and highly available
+composed of strongly consistent distributed 
database
 with powerful SQL, 
key-value and processing APIs

ignite git commit: IGNITE-4394 Web Console: Select only server nodes for local queries on Queries screen.

2017-11-15 Thread akuznetsov 
Repository: ignite
Updated Branches:
  refs/heads/master fa52789d7 -> 63b628da4


IGNITE-4394 Web Console: Select only server nodes for local queries on Queries 
screen.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/63b628da
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/63b628da
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/63b628da

Branch: refs/heads/master
Commit: 63b628da4863ec79ddca211958fb32abc07f9c7d
Parents: fa52789
Author: alexdel 
Authored: Wed Nov 15 21:48:15 2017 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Nov 15 21:48:15 2017 +0700

--
 modules/web-console/frontend/app/modules/sql/sql.controller.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/63b628da/modules/web-console/frontend/app/modules/sql/sql.controller.js
--
diff --git a/modules/web-console/frontend/app/modules/sql/sql.controller.js 
b/modules/web-console/frontend/app/modules/sql/sql.controller.js
index b4c8a6f..f5edb04 100644
--- a/modules/web-console/frontend/app/modules/sql/sql.controller.js
+++ b/modules/web-console/frontend/app/modules/sql/sql.controller.js
@@ -871,7 +871,8 @@ export default ['$rootScope', '$scope', '$http', '$q', 
'$timeout', '$interval',
 ip: 
_.head(node.attributes['org.apache.ignite.ips'].split(', ')),
 version: 
node.attributes['org.apache.ignite.build.ver'],
 gridName: 
node.attributes['org.apache.ignite.ignite.name'],
-os: `${node.attributes['os.name']} 
${node.attributes['os.arch']} ${node.attributes['os.version']}`
+os: `${node.attributes['os.name']} 
${node.attributes['os.arch']} ${node.attributes['os.version']}`,
+client: 
node.attributes['org.apache.ignite.cache.client']
 });
 });
 
@@ -1338,7 +1339,7 @@ export default ['$rootScope', '$scope', '$http', '$q', 
'$timeout', '$interval',
 if (_.isEmpty(name))
 return Promise.resolve(null);
 
-const nodes = cacheNodes(name);
+const nodes = _.filter(cacheNodes(name), (node) => !node.client);
 
 if (local) {
 return Nodes.selectNode(nodes, name)

ignite git commit: IGNITE-6896 .NET: support Multidimensional Arrays in binary serializer

2017-11-15 Thread ptupitsyn 
Repository: ignite
Updated Branches:
  refs/heads/master f992386e2 -> fa52789d7


IGNITE-6896 .NET: support Multidimensional Arrays in binary serializer

This closes #3031


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fa52789d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fa52789d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fa52789d

Branch: refs/heads/master
Commit: fa52789d7679d4c4b65efcdfb86cf146abb920fe
Parents: f992386
Author: Pavel Tupitsyn 
Authored: Wed Nov 15 15:47:58 2017 +0300
Committer: Pavel Tupitsyn 
Committed: Wed Nov 15 15:47:58 2017 +0300

--
 .../Binary/BinarySelfTest.cs|  88 +
 .../Apache.Ignite.Core.csproj   |   2 +
 .../Impl/Binary/BinaryReflectiveActions.cs  |  16 +++
 .../Impl/Binary/BinarySystemHandlers.cs |  13 +-
 .../Impl/Binary/BinaryUtils.cs  |  41 +-
 .../Impl/Binary/Marshaller.cs   |   1 +
 .../Impl/Binary/MultidimensionalArrayHolder.cs  | 132 +++
 .../Binary/MultidimensionalArraySerializer.cs   |  48 +++
 8 files changed, 330 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fa52789d/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
index 3ec1e8c..6ffce38 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
@@ -1532,6 +1532,58 @@ namespace Apache.Ignite.Core.Tests.Binary
 }
 
 /// 
+/// Tests the jagged arrays.
+/// 
+[Test]
+public void TestJaggedArrays()
+{
+int[][] ints = {new[] {1, 2, 3}, new[] {4, 5, 6}};
+Assert.AreEqual(ints, TestUtils.SerializeDeserialize(ints));
+
+uint[][][] uints = {new[] {new uint[] {1, 2, 3}, new uint[] {4, 
5}}};
+Assert.AreEqual(uints, TestUtils.SerializeDeserialize(uints));
+
+PropertyType[][][] objs = {new[] {new[] {new PropertyType {Field1 
= 42;
+Assert.AreEqual(42, 
TestUtils.SerializeDeserialize(objs)[0][0][0].Field1);
+
+var obj = new MultidimArrays { JaggedInt = ints, JaggedUInt = 
uints };
+var resObj = TestUtils.SerializeDeserialize(obj);
+Assert.AreEqual(obj.JaggedInt, resObj.JaggedInt);
+Assert.AreEqual(obj.JaggedUInt, resObj.JaggedUInt);
+
+var obj2 = new MultidimArraysBinarizable { JaggedInt = ints, 
JaggedUInt = uints };
+var resObj2 = TestUtils.SerializeDeserialize(obj);
+Assert.AreEqual(obj2.JaggedInt, resObj2.JaggedInt);
+Assert.AreEqual(obj2.JaggedUInt, resObj2.JaggedUInt);
+}
+
+/// 
+/// Tests the multidimensional arrays.
+/// 
+[Test]
+public void TestMultidimensionalArrays()
+{
+int[,] ints = {{1, 2, 3}, {4, 5, 6}};
+Assert.AreEqual(ints, TestUtils.SerializeDeserialize(ints));
+
+uint[,,] uints = {{{1, 2, 3}, {4, 5, 6}}, {{7, 8, 9}, {10, 11, 
12}}};
+Assert.AreEqual(uints, TestUtils.SerializeDeserialize(uints));
+
+PropertyType[,] objs = {{new PropertyType {Field1 = 123}}};
+Assert.AreEqual(123, TestUtils.SerializeDeserialize(objs)[0, 
0].Field1);
+
+var obj = new MultidimArrays { MultidimInt = ints, MultidimUInt = 
uints };
+var resObj = TestUtils.SerializeDeserialize(obj);
+Assert.AreEqual(obj.MultidimInt, resObj.MultidimInt);
+Assert.AreEqual(obj.MultidimUInt, resObj.MultidimUInt);
+
+var obj2 = new MultidimArraysBinarizable { MultidimInt = ints, 
MultidimUInt = uints };
+var resObj2 = TestUtils.SerializeDeserialize(obj);
+Assert.AreEqual(obj2.MultidimInt, resObj2.MultidimInt);
+Assert.AreEqual(obj2.MultidimUInt, resObj2.MultidimUInt);
+}
+
+/// 
 /// Tests the compact footer setting.
 /// 
 [Test]
@@ -2604,5 +2656,41 @@ namespace Apache.Ignite.Core.Tests.Binary
 return !left.Equals(right);
 }
 }
+
+private class MultidimArrays
+{
+public int[][] JaggedInt { get; set; }
+public uint[][][] JaggedUInt { get; set; }
+
+public int[,] MultidimInt { get; set; }
+public uint[,,] MultidimUInt { get; set; }
+}
+
+private

ignite git commit: IGNITE-5635 Web Console: Added spinning wheel for execute, scan and export actions on Queries screen.

2017-11-15 Thread akuznetsov 
Repository: ignite
Updated Branches:
  refs/heads/master 8c278ca9b -> f992386e2


IGNITE-5635 Web Console: Added spinning wheel for execute, scan and export 
actions on Queries screen.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f992386e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f992386e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f992386e

Branch: refs/heads/master
Commit: f992386e25e643f329b219ec2d0f877e50920b40
Parents: 8c278ca
Author: alexdel 
Authored: Wed Nov 15 19:35:30 2017 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Nov 15 19:35:30 2017 +0700

--
 .../frontend/app/modules/sql/sql.controller.js  | 28 ++-
 .../frontend/public/stylesheets/style.scss  | 10 +++
 .../web-console/frontend/views/sql/sql.tpl.pug  | 84 ++--
 3 files changed, 112 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f992386e/modules/web-console/frontend/app/modules/sql/sql.controller.js
--
diff --git a/modules/web-console/frontend/app/modules/sql/sql.controller.js 
b/modules/web-console/frontend/app/modules/sql/sql.controller.js
index 8d27d30..b4c8a6f 100644
--- a/modules/web-console/frontend/app/modules/sql/sql.controller.js
+++ b/modules/web-console/frontend/app/modules/sql/sql.controller.js
@@ -59,6 +59,9 @@ class Paragraph {
 self.maxPages = 0;
 self.filter = '';
 self.useAsDefaultSchema = false;
+self.localQueryMode = false;
+self.csvIsPreparing = false;
+self.scanningInProgress = false;
 
 _.assign(this, paragraph);
 
@@ -200,6 +203,14 @@ class Paragraph {
 chartTimeLineEnabled() {
 return _.nonEmpty(this.chartKeyCols) && _.eq(this.chartKeyCols[0], 
TIME_LINE);
 }
+
+executionInProgress(showLocal = false) {
+return this.loading && (this.localQueryMode === showLocal);
+}
+
+checkScanInProgress(showLocal = false) {
+return this.scanningInProgress && (this.localQueryMode === showLocal);
+}
 }
 
 // Controller for SQL notebook screen.
@@ -1409,6 +1420,8 @@ export default ['$rootScope', '$scope', '$http', '$q', 
'$timeout', '$interval',
 const enforceJoinOrder = !!paragraph.enforceJoinOrder;
 const lazy = !!paragraph.lazy;
 
+paragraph.localQueryMode = local;
+
 $scope.queryAvailable(paragraph) && 
_chooseNode(paragraph.cacheName, local)
 .then((nid) => {
 Notebook.save($scope.notebook)
@@ -1506,8 +1519,12 @@ export default ['$rootScope', '$scope', '$http', '$q', 
'$timeout', '$interval',
 const filter = paragraph.filter;
 const pageSize = paragraph.pageSize;
 
+paragraph.localQueryMode = local;
+
 $scope.scanAvailable(paragraph) && _chooseNode(cacheName, local)
 .then((nid) => {
+paragraph.scanningInProgress = true;
+
 Notebook.save($scope.notebook)
 .catch(Messages.showError);
 
@@ -1537,7 +1554,8 @@ export default ['$rootScope', '$scope', '$http', '$q', 
'$timeout', '$interval',
 paragraph.setError(err);
 
 _showLoading(paragraph, false);
-});
+})
+.then(() => paragraph.scanningInProgress = false);
 });
 };
 
@@ -1664,6 +1682,8 @@ export default ['$rootScope', '$scope', '$http', '$q', 
'$timeout', '$interval',
 };
 
 $scope.exportCsvAll = (paragraph) => {
+paragraph.csvIsPreparing = true;
+
 const args = paragraph.queryArgs;
 
 return Promise.resolve(args.localNid || 
_chooseNode(args.cacheName, false))
@@ -1672,7 +1692,11 @@ export default ['$rootScope', '$scope', '$http', '$q', 
'$timeout', '$interval',
 : agentMgr.querySqlGetAll(nid, args.cacheName, args.query, 
!!args.nonCollocatedJoins, !!args.enforceJoinOrder, false, !!args.localNid, 
!!args.lazy))
 .then((res) => _export(exportFileName(paragraph, true), 
paragraph.gridOptions.columnDefs, res.columns, res.rows))
 .catch(Messages.showError)
-.then(() => paragraph.ace && paragraph.ace.focus());
+.then(() => {
+paragraph.csvIsPreparing = false;
+
+return paragraph.ace && paragraph.ace.focus();
+});
 };
 
 // $scope.exportPdfAll = function(paragraph) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/f992386e/modules/web-console/frontend/public/stylesheets/style.scss

ignite git commit: IGNITE-6836: Implemented query timeout. This closes #3015

2017-11-15 Thread isapego 
Repository: ignite
Updated Branches:
  refs/heads/master 4589ff2d4 -> 8c278ca9b


IGNITE-6836: Implemented query timeout.
This closes #3015


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8c278ca9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8c278ca9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8c278ca9

Branch: refs/heads/master
Commit: 8c278ca9b67cd17dfd882e0eb65e19745798876d
Parents: 4589ff2
Author: Igor Sapego 
Authored: Wed Nov 15 13:41:31 2017 +0300
Committer: Igor Sapego 
Committed: Wed Nov 15 13:41:31 2017 +0300

--
 .../processors/odbc/odbc/OdbcMessageParser.java | 14 ++-
 .../odbc/odbc/OdbcQueryExecuteBatchRequest.java | 16 +++-
 .../odbc/odbc/OdbcQueryExecuteRequest.java  | 16 +++-
 .../odbc/odbc/OdbcRequestHandler.java   |  9 ++--
 .../cpp/odbc-test/src/attributes_test.cpp   | 22 ++
 .../platforms/cpp/odbc-test/src/parser_test.cpp |  2 +-
 .../cpp/odbc/include/ignite/odbc/message.h  | 33 ++-
 .../cpp/odbc/include/ignite/odbc/parser.h   |  2 +-
 .../include/ignite/odbc/query/batch_query.h |  8 +++-
 .../odbc/include/ignite/odbc/query/data_query.h |  8 +++-
 .../cpp/odbc/include/ignite/odbc/statement.h|  4 ++
 modules/platforms/cpp/odbc/src/message.cpp  | 34 ++--
 .../cpp/odbc/src/query/batch_query.cpp  |  9 ++--
 .../platforms/cpp/odbc/src/query/data_query.cpp |  9 ++--
 modules/platforms/cpp/odbc/src/statement.cpp| 43 ++--
 15 files changed, 180 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8c278ca9/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcMessageParser.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcMessageParser.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcMessageParser.java
index fb17d2a..c2137bd 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcMessageParser.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcMessageParser.java
@@ -96,7 +96,12 @@ public class OdbcMessageParser implements 
ClientListenerMessageParser {
 
 Object[] params = readParameterRow(reader, paramNum);
 
-res = new OdbcQueryExecuteRequest(schema, sql, params);
+int timeout = 0;
+
+if (ver.compareTo(OdbcConnectionContext.VER_2_3_2) >= 0)
+timeout = reader.readInt();
+
+res = new OdbcQueryExecuteRequest(schema, sql, params, 
timeout);
 
 break;
 }
@@ -113,7 +118,12 @@ public class OdbcMessageParser implements 
ClientListenerMessageParser {
 for (int i = 0; i < rowNum; ++i)
 params[i] = readParameterRow(reader, paramRowLen);
 
-res = new OdbcQueryExecuteBatchRequest(schema, sql, last, 
params);
+int timeout = 0;
+
+if (ver.compareTo(OdbcConnectionContext.VER_2_3_2) >= 0)
+timeout = reader.readInt();
+
+res = new OdbcQueryExecuteBatchRequest(schema, sql, last, 
params, timeout);
 
 break;
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/8c278ca9/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryExecuteBatchRequest.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryExecuteBatchRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryExecuteBatchRequest.java
index 50d16e5..0e4effd 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryExecuteBatchRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryExecuteBatchRequest.java
@@ -41,13 +41,19 @@ public class OdbcQueryExecuteBatchRequest extends 
OdbcRequest {
 @GridToStringExclude
 private final Object[][] args;
 
+/** Query timeout in seconds. */
+@GridToStringInclude
+private final int timeout;
+
 /**
  * @param schema Schema.
  * @param sqlQry SQL query.
  * @param last Last page flag.
  * @param args Arguments list.
+ * @param timeout Timeout in seconds.
  */
-public OdbcQueryExecuteBatchRequest(@Nullable String schema, String 
sqlQry, boolean last, Object[][] args) {
+public OdbcQueryExecuteBatchRequest(@Nullable String schema, String 
sqlQry, boolean

[4/5] ignite git commit: zk

2017-11-15 Thread sboikov 
zk


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aa0ca90c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aa0ca90c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aa0ca90c

Branch: refs/heads/ignite-zk
Commit: aa0ca90cbaec809715190c1036654a6aad0fb0a3
Parents: ac07cbe
Author: sboikov 
Authored: Wed Nov 15 12:50:14 2017 +0300
Committer: sboikov 
Committed: Wed Nov 15 12:50:14 2017 +0300

--
 .../spi/discovery/zk/ZookeeperDiscoverySpi.java | 14 
 .../zk/ZookeeperDiscoverySpiBasicTest.java  | 34 
 2 files changed, 48 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/aa0ca90c/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
--
diff --git 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
index 1659dcf..cee9e65 100644
--- 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
+++ 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
@@ -20,6 +20,7 @@ package org.apache.ignite.spi.discovery.zk;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -425,6 +426,19 @@ public class ZookeeperDiscoverySpi extends 
IgniteSpiAdapter implements Discovery
 
 if (log != null)
 log.info("Curator event, connection: " + newState);
+
+if (newState == ConnectionState.LOST) {
+U.warn(log, "Connection was lost, local node 
SEGMENTED");
+
+zkCurator.close();
+
+lsnr.onDiscovery(EventType.EVT_NODE_SEGMENTED,
+0,
+locNode,
+Collections.emptyList(),
+Collections.emptyMap(),
+null);
+}
 }
 });
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/aa0ca90c/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiBasicTest.java
--
diff --git 
a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiBasicTest.java
 
b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiBasicTest.java
index 4cd86db..bc577d2 100644
--- 
a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiBasicTest.java
+++ 
b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiBasicTest.java
@@ -24,6 +24,8 @@ import java.util.TreeMap;
 import java.util.UUID;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.curator.test.TestingCluster;
 import org.apache.ignite.Ignite;
@@ -262,6 +264,38 @@ public class ZookeeperDiscoverySpiBasicTest extends 
GridCommonAbstractTest {
 /**
  * @throws Exception If failed.
  */
+public void testSegmentation1() throws Exception {
+sesTimeout = 2000;
+testSockNio = true;
+
+Ignite node0 = startGrid(0);
+
+final CountDownLatch l = new CountDownLatch(1);
+
+node0.events().localListen(new IgnitePredicate() {
+@Override public boolean apply(Event event) {
+l.countDown();
+
+return false;
+}
+}, EventType.EVT_NODE_SEGMENTED);
+
+ZkTestClientCnxnSocketNIO c0 = 
ZkTestClientCnxnSocketNIO.forNode(node0);
+
+c0.closeSocket(true);
+
+Thread.sleep(4_000);
+
+info("Allow connect");
+
+c0.allowConnect();
+
+assertTrue(l.await(10, TimeUnit.SECONDS));
+}
+
+/**
+ * @throws Exception If failed.
+ */
 public void testConnectionRestore1() throws Exception {
 testSockNio = true;

[2/5] ignite git commit: zk

2017-11-15 Thread sboikov 
zk


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/775a60f7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/775a60f7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/775a60f7

Branch: refs/heads/ignite-zk
Commit: 775a60f79904686b2e443789ae8c62df74f4d6fa
Parents: d2f5a76
Author: sboikov 
Authored: Tue Nov 14 17:36:24 2017 +0300
Committer: sboikov 
Committed: Tue Nov 14 17:36:24 2017 +0300

--
 .../apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java   | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/775a60f7/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
--
diff --git 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
index 4adb427..d27987b 100644
--- 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
+++ 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
@@ -939,6 +939,7 @@ public class ZookeeperDiscoverySpi extends IgniteSpiAdapter 
implements Discovery
 }
 
 try {
+// TODO ZK: handle case if node exists after crd change.
 for (ZKDiscoveryEvent evt : evts.values())
 
zkCurator.create().withMode(CreateMode.PERSISTENT).forPath(DISCO_EVTS_HIST_PATH 
+ "/" + evt.topVer, marshal(evt));
 }
@@ -969,6 +970,7 @@ public class ZookeeperDiscoverySpi extends IgniteSpiAdapter 
implements Discovery
 /** */
 private ZKDiscoveryEvent lastEvt;
 
+/** */
 private int lastProcessed = -1;
 
 /**
@@ -1144,6 +1146,9 @@ public class ZookeeperDiscoverySpi extends 
IgniteSpiAdapter implements Discovery
 this.nextJoinOrder = nextJoinOrder;
 this.aliveNodes = aliveNodes;
 this.evts = evts;
+
+while (evts.size() > 1000)
+evts.remove(evts.first());
 }
 
 /** {@inheritDoc} */

[1/5] ignite git commit: zk

2017-11-15 Thread sboikov 
Repository: ignite
Updated Branches:
  refs/heads/ignite-zk 1ee551c85 -> 4ec75fa29


zk


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d2f5a76c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d2f5a76c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d2f5a76c

Branch: refs/heads/ignite-zk
Commit: d2f5a76cc725052d76a216603b2579f17ba92d60
Parents: 54211bf
Author: sboikov 
Authored: Tue Nov 14 16:34:42 2017 +0300
Committer: sboikov 
Committed: Tue Nov 14 16:34:42 2017 +0300

--
 .../org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d2f5a76c/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
--
diff --git 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
index cc0e6a4..4adb427 100644
--- 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
+++ 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
@@ -829,7 +829,7 @@ public class ZookeeperDiscoverySpi extends IgniteSpiAdapter 
implements Discovery
 }
 }
 
-// TODO ZK: process joinHist
+// TODO ZK: first send, then process?
 
 if (joined != null) {
 assert joined.joinData != null : joined;

[3/5] ignite git commit: Merge remote-tracking branch 'origin/ignite-zk' into ignite-zk

2017-11-15 Thread sboikov 
Merge remote-tracking branch 'origin/ignite-zk' into ignite-zk


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ac07cbee
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ac07cbee
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ac07cbee

Branch: refs/heads/ignite-zk
Commit: ac07cbee75f3f230a12075ac91e4dad0f1a89b0b
Parents: 775a60f 1ee551c
Author: sboikov 
Authored: Wed Nov 15 10:10:24 2017 +0300
Committer: sboikov 
Committed: Wed Nov 15 10:10:24 2017 +0300

--
 .../spi/discovery/zk/ZookeeperDiscoverySpi.java | 135 ---
 .../zk/ZookeeperDiscoverySpiBasicTest.java  |  17 ++-
 2 files changed, 102 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/ac07cbee/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
--

[5/5] ignite git commit: zk

2017-11-15 Thread sboikov 
zk


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4ec75fa2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4ec75fa2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4ec75fa2

Branch: refs/heads/ignite-zk
Commit: 4ec75fa2900e3f4624d6516e0c50fc1877d7b5cc
Parents: aa0ca90
Author: sboikov 
Authored: Wed Nov 15 13:12:26 2017 +0300
Committer: sboikov 
Committed: Wed Nov 15 13:12:26 2017 +0300

--
 .../ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java  | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/4ec75fa2/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
--
diff --git 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
index cee9e65..6488a6f 100644
--- 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
+++ 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
@@ -315,12 +315,12 @@ public class ZookeeperDiscoverySpi extends 
IgniteSpiAdapter implements Discovery
 /** {@inheritDoc} */
 @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) 
throws IgniteException {
 // TODO ZK
-try {
-
zkCurator.create().withMode(CreateMode.PERSISTENT_SEQUENTIAL).forPath(CUSTOM_EVTS_PATH,
 marshal(msg));
-}
-catch (Exception e) {
-throw new IgniteSpiException(e);
-}
+//try {
+//
zkCurator.create().withMode(CreateMode.PERSISTENT_SEQUENTIAL).forPath(CUSTOM_EVTS_PATH,
 marshal(msg));
+//}
+//catch (Exception e) {
+//throw new IgniteSpiException(e);
+//}
 }
 
 /** {@inheritDoc} */

ignite git commit: IGNITE-6859 Web Console: Do not split base64 strings to multiple lines because IE11 atob() implementation does not work with these.

2017-11-15 Thread akuznetsov 
Repository: ignite
Updated Branches:
  refs/heads/master cba8fa2f2 -> 4589ff2d4


IGNITE-6859 Web Console: Do not split base64 strings to multiple lines because 
IE11 atob() implementation does not work with these.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4589ff2d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4589ff2d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4589ff2d

Branch: refs/heads/master
Commit: 4589ff2d42f0553e311f4fb4dfd545fce38374dc
Parents: cba8fa2
Author: Ilya Borisov 
Authored: Wed Nov 15 16:03:13 2017 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Nov 15 16:03:13 2017 +0700

--
 .../org/apache/ignite/console/agent/handlers/AbstractListener.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/4589ff2d/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/AbstractListener.java
--
diff --git 
a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/AbstractListener.java
 
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/AbstractListener.java
index fc4daef..ace2087 100644
--- 
a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/AbstractListener.java
+++ 
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/AbstractListener.java
@@ -82,7 +82,7 @@ abstract class AbstractListener implements Emitter.Listener {
 
 if (restRes.getData() != null) {
 ByteArrayOutputStream baos = new 
ByteArrayOutputStream(4096);
-Base64OutputStream b64os = new 
Base64OutputStream(baos);
+Base64OutputStream b64os = new 
Base64OutputStream(baos, true, 0, null);
 GZIPOutputStream gzip = new 
GZIPOutputStream(b64os);
 
 gzip.write(restRes.getData().getBytes(UTF8));