[ignite] branch master updated: Revert "IGNITE-13262 Cleanup duplicated code. Refactored to IgniteLogger. Cleanup self references in IgniteUtils. - Fixes #8044."
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new f28fac6 Revert "IGNITE-13262 Cleanup duplicated code. Refactored to
IgniteLogger. Cleanup self references in IgniteUtils. - Fixes #8044."
f28fac6 is described below
commit f28fac66efccbd0367c311558ebe93b45ba56f37
Author: Alexey Kuznetsov
AuthorDate: Tue Aug 4 18:26:32 2020 +0700
Revert "IGNITE-13262 Cleanup duplicated code. Refactored to IgniteLogger.
Cleanup self references in IgniteUtils. - Fixes #8044."
This reverts commit 83de845a21200b4fc786eb7ecf943a5114393bdf.
---
.../GridClientConnectionManagerAdapter.java| 39 ++--
.../client/impl/connection/GridClientTopology.java | 7 +-
.../client/util/GridClientStripedLock.java | 5 +-
.../internal/client/util/GridClientUtils.java | 45 +
.../apache/ignite/internal/util/IgniteUtils.java | 74 +++---
5 files changed, 108 insertions(+), 62 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
index c599b01..6fde7ad 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
@@ -33,6 +33,7 @@ import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
+import java.util.logging.Level;
import java.util.logging.Logger;
import javax.net.ssl.SSLContext;
import org.apache.ignite.IgniteCheckedException;
@@ -50,6 +51,7 @@ import
org.apache.ignite.internal.client.impl.GridClientThreadFactory;
import org.apache.ignite.internal.client.marshaller.GridClientMarshaller;
import
org.apache.ignite.internal.client.marshaller.optimized.GridClientZipOptimizedMarshaller;
import org.apache.ignite.internal.client.util.GridClientStripedLock;
+import org.apache.ignite.internal.client.util.GridClientUtils;
import
org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeResponse;
import
org.apache.ignite.internal.processors.rest.client.message.GridClientMessage;
import
org.apache.ignite.internal.processors.rest.client.message.GridClientPingPacket;
@@ -66,6 +68,7 @@ import org.apache.ignite.logger.java.JavaLogger;
import org.apache.ignite.plugin.security.SecurityCredentials;
import org.jetbrains.annotations.Nullable;
+import static java.util.logging.Level.INFO;
import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MACS;
import static
org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.CLIENT_CLOSED;
import static
org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.FAILED;
@@ -81,7 +84,7 @@ public abstract class GridClientConnectionManagerAdapter
implements GridClientCo
private static final int INIT_RETRY_INTERVAL = 1000;
/** Class logger. */
-private final IgniteLogger log;
+private final Logger log;
/** All local enabled MACs. */
private final Collection macs;
@@ -154,7 +157,7 @@ public abstract class GridClientConnectionManagerAdapter
implements GridClientCo
this.routers = new ArrayList<>(routers);
this.top = top;
-log = new JavaLogger(Logger.getLogger(getClass().getName()));
+log = Logger.getLogger(getClass().getName());
executor = cfg.getExecutorService() != null ? cfg.getExecutorService()
:
Executors.newCachedThreadPool(new GridClientThreadFactory("exec",
true));
@@ -409,7 +412,7 @@ public abstract class GridClientConnectionManagerAdapter
implements GridClientCo
catch (Exception e) {
if (cause == null)
cause = e;
-else if (log.isInfoEnabled())
+else if (log.isLoggable(INFO))
log.info("Unable to connect to grid node [srvAddr=" + srv
+ ", msg=" + e.getMessage() + ']');
}
}
@@ -506,8 +509,8 @@ public abstract class GridClientConnectionManagerAdapter
implements GridClientCo
/** {@inheritDoc} */
@Override public void terminateConnection(GridClientConnection conn,
GridClientNode node, Throwable e) {
-if (log.isDebugEnabled())
-log.debug("Connection with remote node was terminated [node=" +
node + ", srvAddr=" +
+if (log.isLoggable(Level.FINE))
+log.f
[ignite] branch master updated: IGNITE-13262 Cleanup duplicated code. Refactored to IgniteLogger. Cleanup self references in IgniteUtils. - Fixes #8044.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 83de845 IGNITE-13262 Cleanup duplicated code. Refactored to
IgniteLogger. Cleanup self references in IgniteUtils. - Fixes #8044.
83de845 is described below
commit 83de845a21200b4fc786eb7ecf943a5114393bdf
Author: Alexey Kuznetsov
AuthorDate: Thu Jul 23 14:35:44 2020 +0700
IGNITE-13262 Cleanup duplicated code. Refactored to IgniteLogger. Cleanup
self references in IgniteUtils. - Fixes #8044.
Signed-off-by: Alexey Kuznetsov
---
.../GridClientConnectionManagerAdapter.java| 39 ++-
.../client/impl/connection/GridClientTopology.java | 7 +-
.../client/util/GridClientStripedLock.java | 5 +-
.../internal/client/util/GridClientUtils.java | 45 -
.../apache/ignite/internal/util/IgniteUtils.java | 75 +++---
5 files changed, 62 insertions(+), 109 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
index 6fde7ad..c599b01 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
@@ -33,7 +33,6 @@ import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
-import java.util.logging.Level;
import java.util.logging.Logger;
import javax.net.ssl.SSLContext;
import org.apache.ignite.IgniteCheckedException;
@@ -51,7 +50,6 @@ import
org.apache.ignite.internal.client.impl.GridClientThreadFactory;
import org.apache.ignite.internal.client.marshaller.GridClientMarshaller;
import
org.apache.ignite.internal.client.marshaller.optimized.GridClientZipOptimizedMarshaller;
import org.apache.ignite.internal.client.util.GridClientStripedLock;
-import org.apache.ignite.internal.client.util.GridClientUtils;
import
org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeResponse;
import
org.apache.ignite.internal.processors.rest.client.message.GridClientMessage;
import
org.apache.ignite.internal.processors.rest.client.message.GridClientPingPacket;
@@ -68,7 +66,6 @@ import org.apache.ignite.logger.java.JavaLogger;
import org.apache.ignite.plugin.security.SecurityCredentials;
import org.jetbrains.annotations.Nullable;
-import static java.util.logging.Level.INFO;
import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MACS;
import static
org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.CLIENT_CLOSED;
import static
org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.FAILED;
@@ -84,7 +81,7 @@ public abstract class GridClientConnectionManagerAdapter
implements GridClientCo
private static final int INIT_RETRY_INTERVAL = 1000;
/** Class logger. */
-private final Logger log;
+private final IgniteLogger log;
/** All local enabled MACs. */
private final Collection macs;
@@ -157,7 +154,7 @@ public abstract class GridClientConnectionManagerAdapter
implements GridClientCo
this.routers = new ArrayList<>(routers);
this.top = top;
-log = Logger.getLogger(getClass().getName());
+log = new JavaLogger(Logger.getLogger(getClass().getName()));
executor = cfg.getExecutorService() != null ? cfg.getExecutorService()
:
Executors.newCachedThreadPool(new GridClientThreadFactory("exec",
true));
@@ -412,7 +409,7 @@ public abstract class GridClientConnectionManagerAdapter
implements GridClientCo
catch (Exception e) {
if (cause == null)
cause = e;
-else if (log.isLoggable(INFO))
+else if (log.isInfoEnabled())
log.info("Unable to connect to grid node [srvAddr=" + srv
+ ", msg=" + e.getMessage() + ']');
}
}
@@ -509,8 +506,8 @@ public abstract class GridClientConnectionManagerAdapter
implements GridClientCo
/** {@inheritDoc} */
@Override public void terminateConnection(GridClientConnection conn,
GridClientNode node, Throwable e) {
-if (log.isLoggable(Level.FINE))
-log.fine("Connection with remote node was terminated [node=" +
node + ", srvAddr=" +
+if (log.isDebugEnabled())
+log.debug("Connection with remote node was terminated [node=" +
node + ", srvAddr
[ignite-web-console] branch ignite-13038 deleted (was 203f20c)
This is an automated email from the ASF dual-hosted git repository. akuznetsov pushed a change to branch ignite-13038 in repository https://gitbox.apache.org/repos/asf/ignite-web-console.git. was 203f20c IGNITE-13038 Moved Web Console to separate repository. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[ignite-web-console] 02/02: IGNITE-13038 Merged to master.
This is an automated email from the ASF dual-hosted git repository. akuznetsov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite-web-console.git commit cfaeda730f0a1ec3cb153fb5cc2e7473b078b41d Author: Alexey Kuznetsov AuthorDate: Tue Jul 21 12:23:38 2020 +0700 IGNITE-13038 Merged to master. --- README.md | 35 +++ README.txt | 36 2 files changed, 35 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 8b13789..286082c 100644 --- a/README.md +++ b/README.md @@ -1 +1,36 @@ +Ignite Web Console +== +An Interactive Configuration Wizard and Management Tool for Apache Ignite + +The Apache Ignite Web Console includes an interactive configuration wizard which helps you create and download configuration + files for your Apache Ignite cluster. The tool also provides management capabilities which allow you to run SQL queries + on your in-memory cache as well as view execution plans, in-memory schema, and streaming charts. + +In order to simplify evaluation of Web Console demo mode was implemented. + To start demo, you need to click button "Start demo". New tab will be open with prepared demo data on each screen. + + Demo for import domain model from database. + In this mode an in-memory H2 database will be started. + How to evaluate: +1) Go to Ignite Web Console "Domain model" screen. +2) Click "Import from database". You should see modal with demo description. +3) Click "Next" button. You should see list of available schemas. +4) Click "Next" button. You should see list of available tables. +5) Click "Next" button. You should see import options. +6) Select some of them and click "Save". + + Demo for SQL. + How to evaluate: +In this mode internal Ignite node will be started. Cache created and populated with data. + 1) Click "SQL" in Ignite Web Console top menu. + 2) "Demo" notebook with preconfigured queries will be opened. + 3) You can also execute any SQL queries for tables: "Country, Department, Employee, Parking, Car". + + For example: + 1) Enter SQL statement: + SELECT p.name, count(*) AS cnt FROM "ParkingCache".Parking p + INNER JOIN "CarCache".Car c ON (p.id) = (c.parkingId) + GROUP BY P.NAME + 2) Click "Execute" button. You should get some data in table. + 3) Click charts buttons to see auto generated charts. diff --git a/README.txt b/README.txt deleted file mode 100644 index 286082c..000 --- a/README.txt +++ /dev/null @@ -1,36 +0,0 @@ -Ignite Web Console -== -An Interactive Configuration Wizard and Management Tool for Apache Ignite - -The Apache Ignite Web Console includes an interactive configuration wizard which helps you create and download configuration - files for your Apache Ignite cluster. The tool also provides management capabilities which allow you to run SQL queries - on your in-memory cache as well as view execution plans, in-memory schema, and streaming charts. - -In order to simplify evaluation of Web Console demo mode was implemented. - To start demo, you need to click button "Start demo". New tab will be open with prepared demo data on each screen. - - Demo for import domain model from database. - In this mode an in-memory H2 database will be started. - How to evaluate: -1) Go to Ignite Web Console "Domain model" screen. -2) Click "Import from database". You should see modal with demo description. -3) Click "Next" button. You should see list of available schemas. -4) Click "Next" button. You should see list of available tables. -5) Click "Next" button. You should see import options. -6) Select some of them and click "Save". - - Demo for SQL. - How to evaluate: -In this mode internal Ignite node will be started. Cache created and populated with data. - 1) Click "SQL" in Ignite Web Console top menu. - 2) "Demo" notebook with preconfigured queries will be opened. - 3) You can also execute any SQL queries for tables: "Country, Department, Employee, Parking, Car". - - For example: - 1) Enter SQL statement: - SELECT p.name, count(*) AS cnt FROM "ParkingCache".Parking p - INNER JOIN "CarCache".Car c ON (p.id) = (c.parkingId) - GROUP BY P.NAME - 2) Click "Execute" button. You should get some data in table. - 3) Click charts buttons to see auto generated charts. -
[ignite-web-console] 01/02: Merge branch 'ignite-13038'
This is an automated email from the ASF dual-hosted git repository. akuznetsov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite-web-console.git commit ccfdf1c0d7c48e7644fb807c48a8433abd53f13e Merge: 6bb7bb4 203f20c Author: Alexey Kuznetsov AuthorDate: Tue Jul 21 12:22:33 2020 +0700 Merge branch 'ignite-13038' .dockerignore |10 + .gitignore | 6 + DEVNOTES.txt | 145 + README.txt |36 + assembly/README.txt| 127 + assembly/direct-install.xml|91 + docker/compose/backend/Dockerfile |35 + docker/compose/docker-compose.yml |55 + docker/compose/frontend/Dockerfile |45 + docker/compose/frontend/nginx/nginx.conf |59 + docker/compose/frontend/nginx/web-console.conf |62 + docker/web-agent/Dockerfile|46 + docker/web-agent/README.txt|36 + docker/web-console/standalone/Dockerfile |84 + docker/web-console/standalone/README.txt |35 + docker/web-console/standalone/docker-entrypoint.sh |23 + docker/web-console/standalone/nginx/nginx.conf |55 + .../web-console/standalone/nginx/web-console.conf |62 + licenses/apache-2.0.txt| 202 + licenses/cc-by-3.0.txt | 319 + modules/backend/.eslintrc | 169 + modules/backend/.gitignore | 3 + modules/backend/agent_dists/README.txt | 6 + modules/backend/app/agentSocket.js | 124 + modules/backend/app/agentsHandler.js | 419 + modules/backend/app/apiServer.js |88 + modules/backend/app/browsersHandler.js | 348 + modules/backend/app/configure.js | 104 + modules/backend/app/mongo.js | 180 + modules/backend/app/nconf.js |54 + modules/backend/app/routes.js |66 + modules/backend/app/schemas.js | 1323 ++ modules/backend/app/settings.js| 150 + modules/backend/config/settings.json.sample|36 + modules/backend/errors/AppErrorException.js|34 + modules/backend/errors/AuthFailedException.js |30 + modules/backend/errors/DuplicateKeyException.js|28 + modules/backend/errors/IllegalAccessError.js |30 + modules/backend/errors/IllegalArgumentException.js |28 + .../errors/MissingConfirmRegistrationException.js |34 + modules/backend/errors/MissingResourceException.js |30 + modules/backend/errors/ServerErrorException.js |35 + modules/backend/errors/index.js|43 + modules/backend/index.js |41 + modules/backend/injector.js|29 + modules/backend/launch-tools.js| 113 + modules/backend/middlewares/api.js |60 + modules/backend/middlewares/demo.js|31 + modules/backend/middlewares/host.js|40 + modules/backend/middlewares/user.js|36 + .../migrations/1502249492000-invalidate_rename.js |28 + .../migrations/1502432624000-cache-index.js|32 + .../backend/migrations/1504672035000-igfs-index.js |32 + .../migrations/1505114649000-models-index.js |32 + .../1508395969410-init-registered-date.js |34 + .../migrations/1516948939797-migrate-configs.js| 399 + .../1547440382485-account-make-email-unique.js |85 + modules/backend/migrations/README.txt | 4 + modules/backend/migrations/migration-utils.js | 127 + modules/backend/package-lock.json | 8115 +++ modules/backend/package.json |86 + modules/backend/routes/activities.js |46 + modules/backend/routes/admin.js|91 + modules/backend/routes/caches.js |79 + modules/backend/routes/clusters.js | 108 + modules/backend/routes/configuration.js|53 + modules/backend/routes/demo.js | 145 + modules/backend/routes/demo/caches.json|87 + modules/backend/routes/demo/clusters.json |50 + modules/backend/routes/demo/domains.json | 317 + modules/backend/routes/demo/igfss.json |10 + modules/backend/routes/domains.js |84 + modules/backend/routes/downloads.js|59 + modules/backend/routes/igfss.js|79 + modules/backend/routes/notebooks.js
[ignite-web-console] branch ignite-13038 created (now 0a8bd54)
This is an automated email from the ASF dual-hosted git repository. akuznetsov pushed a change to branch ignite-13038 in repository https://gitbox.apache.org/repos/asf/ignite-web-console.git. at 0a8bd54 IGNITE-13249 Update master branch project version to 2.10.0-SNAPSHOT - Fixes #8031. This branch includes the following new commits: new c5201d9 IGNITE-843 Implemented Web Console. new 5a5c448 IGNITE-843 Minor fix for DEVNOTES.txt new 66b6b77 Webconsole: Ignite Version fix. new 12593e4 IGNITE-843 Minor fix in DEVNOTES. new 3731d9b Fixes for yardstick, merges from master. new b125c4d Fixed version in pom.xml new 4f83b76 1.7.0-SNAPSHOT new f4f6abd Merge remote-tracking branch 'remotes/origin/gridgain-7.6.1' new 9ed24bb Ignite Web Console beta2. new b11e0a1 Merge branch 'gridgain-7.6.1' of https://github.com/gridgain/apache-ignite new 1cad924 Ignite Web Console speed up bundle rebuild and watch. Minor fixes. new 7152309 Merge branch 'gridgain-7.6.2' new 410fff0 version changed to: 1.6.4 new dc4760b 1.8.0-SNAPSHOT new b69b2ec Revert "version changed to: 1.6.4" new 636f51b Merge remote-tracking branch 'remotes/community/ignite-1.6.5' into ignite-1.7.2 new 99beabe Merge branch 'ignite-1.7.2' new 273af0e Merge branch master into ignite-db-x new 7adf655 Web Console beta-3. new 6956098 Web Console beta-3. Added execution bit for docker build files. new 702a9c7 Web Console beta-3. Updated Ignite version. new edba147 Fixed containers version in docker compose file. new ac90e4a Web Console beta-3. Fixed import from database. new f25e7a7 Merge branch ignite-1.7.2 to master. new 54e9663 Web Console beta-3. Fixed typo in docker. new 3fde1e2 Merge ignite-1.7.2 to master. new 7705c7a 1.8.0-SNAPSHOT new 8654173 Merge branch ignite-1.7.2 to master. new 6a77c09 Web console beta-4. new 63f44b1 Merge branch ignite-1.7.2 into master. new 8a27ba5 IGNITE-3841 Web console added check for eviction policy max mem and max size consistency. Fixes #1136. new 11af424 Merge ignite-1.7.3 to master. new 7f6fed0 Web console beta-5. new 1b88d77 Fixed license. new 601e76b Merge branch 'ignite-1.7.3' new bf575e6 Web console beta-6. new f098651 Merge branch 'ignite-1.7.4' into 'ignite-1.8'. new 0ab0833 Web console beta-6. Minor fix. new 6758330 Merge branch 'ignite-1.7.4' into 'ignite-1.8'. new e7c3cd5 Merge master into ignite-db-x new 057e555 Merge branches 'master' into 'ignite-db-x'. new 8ab9d16 Merge remote-tracking branch 'remotes/community/ignite-1.7.4' new fe8b418 Merge branch 'ignite-1.8' new 2c20325 2.0.0-SNAPSHOT new d459bbd Merge with master - WIP. new 39560c7 Merge with master - WIP new 6c3e9d3 Web console beta-7. new 57dc250 Web console beta-7. new e266382 Merge apache/master into ignite-gg-8.0.2.ea1 new c93042a IGNITE-4442 Implemented cache affinity configuration. new 8b763ed IGNITE-4442 Implemented cache affinity configuration. new b44c743 Merge branch 'ignite-1.7.5' new 6fed71d Merge branch 'ignite-1.7.5' into ignite-1.8.3 new 83aa859 Merge branch ignite-2.0 into ignite-db-x new b464584 IGNITE-4520 Added credential request for authentication on proxy. new b307a95 IGNITE-4520 Added credential request for authentication on proxy. new 28b7340 IGNITE-4520 Added credential request for authentication on proxy. new 5a97e60 IGNITE-1596 Fixed version sort. new c607dff IGNITE-1596 Fixed version sort. new 8bbaf72 IGNITE-1596 Fixed version sort. new 6470072 IGNITE-4622 Fixed generation in domain model for cache store. new fe3c4c3 IGNITE-4622 Fixed generation in domain model for cache store. new 06da053 IGNITE-4622 Fixed generation in domain model for cache store. new 5bda680 IGNITE-4520 Added credential request for authentication on proxy. new c2d5a70 IGNITE-1596 Fixed version sort. new 5cbf9ef IGNITE-4622 Fixed generation in domain model for cache store. new 5c3b36a IGNITE-4610 Added more informative message. new a68777f IGNITE-4610 Added more informative message. new 71adbce IGNITE-4610 Added more informative message. new ed60d14 1.9.0-SNAPSHOT new c6946f2 IGNITE-4472 Added user activities in Web Console. new 57a70b6 IGNITE-4472 Added user activities in Web Console. new 3bb9bd7 IGNITE-4472 Added user activities in Web Console. new 0e16aa4 IGNITE-4678 Web Console: Implemented demo load as service. new 1acb910 IGNITE-4678 Web Console: Implemented demo load as service. new fd17d26 Merge branch 'ignite-1.8.3' of https://github.com/gridgain/apache-ignite into web-console-production new 11e840b IGNITE-4688: Changed copyrights to 2017. new 92616b2 I
[ignite] branch master updated: IGNITE-13246 New baseline event types added. - Fixes #8034.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new fe77a25 IGNITE-13246 New baseline event types added. - Fixes #8034.
fe77a25 is described below
commit fe77a25f3c7aa4d10a6c6a56550d501995624bc0
Author: ibessonov
AuthorDate: Wed Jul 15 19:47:12 2020 +0700
IGNITE-13246 New baseline event types added. - Fixes #8034.
Signed-off-by: Alexey Kuznetsov
---
.../ignite/events/BaselineEventsLocalTest.java | 29 +++
.../ignite/events/BaselineEventsRemoteTest.java| 29 +++
.../apache/ignite/events/BaselineEventsTest.java | 287 +
.../testsuites/IgniteControlUtilityTestSuite.java | 5 +
.../apache/ignite/events/BaselineChangedEvent.java | 91 +++
.../events/BaselineConfigurationChangedEvent.java | 100 +++
.../java/org/apache/ignite/events/EventType.java | 44
.../cluster/DistributedBaselineConfiguration.java | 14 +-
.../cache/GridCachePartitionExchangeManager.java | 41 ++-
.../cluster/DiscoveryDataClusterState.java | 10 +
.../cluster/GridClusterStateProcessor.java | 37 ++-
.../distributed/DistributedProperty.java | 2 +-
.../distributed/SimpleDistributedProperty.java | 4 +-
13 files changed, 683 insertions(+), 10 deletions(-)
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsLocalTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsLocalTest.java
new file mode 100644
index 000..017240d
--- /dev/null
+++
b/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsLocalTest.java
@@ -0,0 +1,29 @@
+/*
+ * 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.events;
+
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.lang.IgnitePredicate;
+
+/** */
+public class BaselineEventsLocalTest extends BaselineEventsTest {
+/** {@inheritDoc} */
+@Override protected void listen(IgniteEx ignite, IgnitePredicate
lsnr, int... types) {
+ignite.events().localListen(lsnr, types);
+}
+}
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsRemoteTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsRemoteTest.java
new file mode 100644
index 000..e6ac8a1
--- /dev/null
+++
b/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsRemoteTest.java
@@ -0,0 +1,29 @@
+/*
+ * 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.events;
+
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.lang.IgnitePredicate;
+
+/** */
+public class BaselineEventsRemoteTest extends BaselineEventsTest {
+/** {@inheritDoc} */
+@Override protected void listen(IgniteEx ignite, IgnitePredicate
lsnr, int... types) {
+ignite.events(ignite.cluster().forRemotes()).remoteListen((uuid, t) ->
lsnr.apply(t), t -> true, types);
+}
+}
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsTest.java
new file mode 100644
index 000..28b7b9e
--- /dev/null
+++
b/mo
[ignite] branch master updated: Revert "IGNITE-13246 New baseline event types added. - Fixes #8029."
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 1ab8067 Revert "IGNITE-13246 New baseline event types added. - Fixes
#8029."
1ab8067 is described below
commit 1ab806707b503c12515cbbe1f6c3a43d11f04eae
Author: Alexey Kuznetsov
AuthorDate: Tue Jul 14 13:35:47 2020 +0700
Revert "IGNITE-13246 New baseline event types added. - Fixes #8029."
This reverts commit 866d7575ffae80f809ab976edbfb764fd32c7edb.
---
.../ignite/events/BaselineEventsLocalTest.java | 29 ---
.../ignite/events/BaselineEventsRemoteTest.java| 29 ---
.../apache/ignite/events/BaselineEventsTest.java | 287 -
.../testsuites/IgniteControlUtilityTestSuite.java | 5 -
.../apache/ignite/events/BaselineChangedEvent.java | 91 ---
.../events/BaselineConfigurationChangedEvent.java | 100 ---
.../java/org/apache/ignite/events/EventType.java | 44
.../cluster/DistributedBaselineConfiguration.java | 14 +-
.../cache/GridCachePartitionExchangeManager.java | 45 +---
.../cluster/DiscoveryDataClusterState.java | 10 -
.../cluster/GridClusterStateProcessor.java | 37 +--
.../distributed/DistributedProperty.java | 2 +-
.../distributed/SimpleDistributedProperty.java | 4 +-
13 files changed, 10 insertions(+), 687 deletions(-)
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsLocalTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsLocalTest.java
deleted file mode 100644
index 017240d..000
---
a/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsLocalTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.events;
-
-import org.apache.ignite.internal.IgniteEx;
-import org.apache.ignite.lang.IgnitePredicate;
-
-/** */
-public class BaselineEventsLocalTest extends BaselineEventsTest {
-/** {@inheritDoc} */
-@Override protected void listen(IgniteEx ignite, IgnitePredicate
lsnr, int... types) {
-ignite.events().localListen(lsnr, types);
-}
-}
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsRemoteTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsRemoteTest.java
deleted file mode 100644
index e6ac8a1..000
---
a/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsRemoteTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.events;
-
-import org.apache.ignite.internal.IgniteEx;
-import org.apache.ignite.lang.IgnitePredicate;
-
-/** */
-public class BaselineEventsRemoteTest extends BaselineEventsTest {
-/** {@inheritDoc} */
-@Override protected void listen(IgniteEx ignite, IgnitePredicate
lsnr, int... types) {
-ignite.events(ignite.cluster().forRemotes()).remoteListen((uuid, t) ->
lsnr.apply(t), t -> true, types);
-}
-}
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/events/Basel
[ignite] branch master updated: IGNITE-13246 New baseline event types added. - Fixes #8029.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 866d757 IGNITE-13246 New baseline event types added. - Fixes #8029.
866d757 is described below
commit 866d7575ffae80f809ab976edbfb764fd32c7edb
Author: ibessonov
AuthorDate: Tue Jul 14 10:08:33 2020 +0700
IGNITE-13246 New baseline event types added. - Fixes #8029.
Signed-off-by: Alexey Kuznetsov
---
.../ignite/events/BaselineEventsLocalTest.java | 29 +++
.../ignite/events/BaselineEventsRemoteTest.java| 29 +++
.../apache/ignite/events/BaselineEventsTest.java | 287 +
.../testsuites/IgniteControlUtilityTestSuite.java | 5 +
.../apache/ignite/events/BaselineChangedEvent.java | 91 +++
.../events/BaselineConfigurationChangedEvent.java | 100 +++
.../java/org/apache/ignite/events/EventType.java | 44
.../cluster/DistributedBaselineConfiguration.java | 14 +-
.../cache/GridCachePartitionExchangeManager.java | 45 +++-
.../cluster/DiscoveryDataClusterState.java | 10 +
.../cluster/GridClusterStateProcessor.java | 37 ++-
.../distributed/DistributedProperty.java | 2 +-
.../distributed/SimpleDistributedProperty.java | 4 +-
13 files changed, 687 insertions(+), 10 deletions(-)
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsLocalTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsLocalTest.java
new file mode 100644
index 000..017240d
--- /dev/null
+++
b/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsLocalTest.java
@@ -0,0 +1,29 @@
+/*
+ * 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.events;
+
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.lang.IgnitePredicate;
+
+/** */
+public class BaselineEventsLocalTest extends BaselineEventsTest {
+/** {@inheritDoc} */
+@Override protected void listen(IgniteEx ignite, IgnitePredicate
lsnr, int... types) {
+ignite.events().localListen(lsnr, types);
+}
+}
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsRemoteTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsRemoteTest.java
new file mode 100644
index 000..e6ac8a1
--- /dev/null
+++
b/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsRemoteTest.java
@@ -0,0 +1,29 @@
+/*
+ * 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.events;
+
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.lang.IgnitePredicate;
+
+/** */
+public class BaselineEventsRemoteTest extends BaselineEventsTest {
+/** {@inheritDoc} */
+@Override protected void listen(IgniteEx ignite, IgnitePredicate
lsnr, int... types) {
+ignite.events(ignite.cluster().forRemotes()).remoteListen((uuid, t) ->
lsnr.apply(t), t -> true, types);
+}
+}
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsTest.java
new file mode 100644
index 000..28b7b9e
--- /dev/null
+++
b/mo
[ignite] branch master updated: IGNITE-13105 Fixed cursors leak in RunningQueryManager. Code cleanup. #7888 - Fixes #7888.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new f151563 IGNITE-13105 Fixed cursors leak in RunningQueryManager. Code
cleanup. #7888 - Fixes #7888.
f151563 is described below
commit f15156375da16bd960bcf0c36c96bf8f26398ba7
Author: Alexey Kuznetsov
AuthorDate: Fri Jun 5 22:27:14 2020 +0700
IGNITE-13105 Fixed cursors leak in RunningQueryManager. Code cleanup. #7888
- Fixes #7888.
Signed-off-by: Alexey Kuznetsov
---
.../repository/query/IgniteRepositoryQuery.java| 52 ++--
.../springdata/IgniteSpringDataCrudSelfTest.java | 33 ++
.../repository/query/IgniteRepositoryQuery.java| 52 ++--
.../springdata/IgniteSpringDataCrudSelfTest.java | 33 ++
.../repository/query/IgniteRepositoryQuery.java| 72 +-
.../springdata/IgniteSpringDataCrudSelfTest.java | 33 ++
.../ignite/springdata/misc/PersonRepository.java | 3 +
7 files changed, 212 insertions(+), 66 deletions(-)
diff --git
a/modules/spring-data-2.0/src/main/java/org/apache/ignite/springdata20/repository/query/IgniteRepositoryQuery.java
b/modules/spring-data-2.0/src/main/java/org/apache/ignite/springdata20/repository/query/IgniteRepositoryQuery.java
index 3bae2cc..e445e78 100644
---
a/modules/spring-data-2.0/src/main/java/org/apache/ignite/springdata20/repository/query/IgniteRepositoryQuery.java
+++
b/modules/spring-data-2.0/src/main/java/org/apache/ignite/springdata20/repository/query/IgniteRepositoryQuery.java
@@ -20,10 +20,10 @@ package org.apache.ignite.springdata20.repository.query;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
-import java.util.List;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
+import java.util.List;
import javax.cache.Cache;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.query.Query;
@@ -42,10 +42,13 @@ import
org.springframework.data.repository.core.RepositoryMetadata;
import org.springframework.data.repository.query.QueryMethod;
import org.springframework.data.repository.query.RepositoryQuery;
+import static
org.apache.ignite.springdata20.repository.query.IgniteQueryGenerator.addPaging;
+import static
org.apache.ignite.springdata20.repository.query.IgniteQueryGenerator.addSorting;
+
/**
* Ignite SQL query implementation.
*/
-@SuppressWarnings("unchecked")
+@SuppressWarnings({"unchecked", "rawtypes"})
public class IgniteRepositoryQuery implements RepositoryQuery {
/** Defines the way how to process query result */
private enum ReturnStrategy {
@@ -118,9 +121,9 @@ public class IgniteRepositoryQuery implements
RepositoryQuery {
@Override public Object execute(Object[] prmtrs) {
Query qry = prepareQuery(prmtrs);
-QueryCursor qryCursor = cache.query(qry);
-
-return transformQueryCursor(prmtrs, qryCursor);
+try (QueryCursor qryCursor = cache.query(qry)) {
+return transformQueryCursor(prmtrs, qryCursor);
+}
}
/** {@inheritDoc} */
@@ -196,7 +199,7 @@ public class IgniteRepositoryQuery implements
RepositoryQuery {
* @return Query cursor or slice
*/
@Nullable private Object transformQueryCursor(Object[] prmtrs, QueryCursor
qryCursor) {
-if (this.qry.isFieldQuery()) {
+if (qry.isFieldQuery()) {
Iterable qryIter = (Iterable)qryCursor;
switch (returnStgy) {
@@ -207,6 +210,7 @@ public class IgniteRepositoryQuery implements
RepositoryQuery {
list.add(entry.get(0));
return list;
+
case ONE_VALUE:
Iterator iter = qryIter.iterator();
@@ -214,6 +218,7 @@ public class IgniteRepositoryQuery implements
RepositoryQuery {
return iter.next().get(0);
return null;
+
case SLICE_OF_VALUES:
List content = new ArrayList<>();
@@ -221,10 +226,13 @@ public class IgniteRepositoryQuery implements
RepositoryQuery {
content.add(entry.get(0));
return new SliceImpl(content,
(Pageable)prmtrs[prmtrs.length - 1], true);
+
case SLICE_OF_LISTS:
return new SliceImpl(qryCursor.getAll(),
(Pageable)prmtrs[prmtrs.length - 1], true);
+
case LIST_OF_LISTS:
return qryCursor.getAll();
+
default:
throw new IllegalStateException();
}
@@ -240,6 +248,7 @@ public class IgniteRepositoryQuery implements
RepositoryQuery {
list.add(entry.getValue());
return lis
[ignite] branch master updated: IGNITE-13104 Fixed incorrect logic in spring-data repositories for findAllById() and deleteAllById() methods. Code cleanup. #7886 - Fixes #7886.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new e3c09bb IGNITE-13104 Fixed incorrect logic in spring-data
repositories for findAllById() and deleteAllById() methods. Code cleanup. #7886
- Fixes #7886.
e3c09bb is described below
commit e3c09bb36b8193ea0904be6e3b858f1fb0839410
Author: Alexey Kuznetsov
AuthorDate: Fri Jun 5 21:25:46 2020 +0700
IGNITE-13104 Fixed incorrect logic in spring-data repositories for
findAllById() and deleteAllById() methods. Code cleanup. #7886 - Fixes #7886.
Signed-off-by: Alexey Kuznetsov
---
.../repository/support/IgniteRepositoryImpl.java | 51 +++---
.../IgniteSpringDataCrudSelfExpressionTest.java| 33 ++--
.../springdata/IgniteSpringDataCrudSelfTest.java | 196 ++--
.../IgniteSpringDataQueriesSelfTest.java | 32 ++--
.../springdata/misc/ApplicationConfiguration.java | 23 +--
.../ignite/springdata/misc/CacheNamesBean.java | 11 +-
.../org/apache/ignite/springdata/misc/Person.java | 16 +-
.../apache/ignite/springdata/misc/PersonKey.java} | 34 +++-
.../ignite/springdata/misc/PersonRepository.java | 5 +-
.../misc/PersonRepositoryWithCompoundKey.java} | 22 +--
.../springdata/misc/PersonSecondRepository.java| 2 +-
.../repository/support/IgniteRepositoryImpl.java | 51 +++---
.../IgniteSpringDataCrudSelfExpressionTest.java| 33 ++--
.../springdata/IgniteSpringDataCrudSelfTest.java | 198 +++--
.../IgniteSpringDataQueriesSelfTest.java | 18 +-
.../springdata/misc/ApplicationConfiguration.java | 23 +--
.../ignite/springdata/misc/CacheNamesBean.java | 12 +-
.../org/apache/ignite/springdata/misc/Person.java | 16 +-
.../misc/{CacheNamesBean.java => PersonKey.java} | 34 +++-
.../ignite/springdata/misc/PersonRepository.java | 5 +-
...n.java => PersonRepositoryWithCompoundKey.java} | 22 +--
.../springdata/misc/PersonSecondRepository.java| 2 +-
.../repository/support/IgniteRepositoryImpl.java | 51 +++---
.../springdata/IgniteSpringDataCrudSelfTest.java | 136 --
.../springdata/misc/ApplicationConfiguration.java | 25 ++-
.../org/apache/ignite/springdata/misc/Person.java | 19 +-
.../apache/ignite/springdata/misc/PersonKey.java} | 34 +++-
.../ignite/springdata/misc/PersonRepository.java | 4 +-
.../misc/PersonRepositoryWithCompoundKey.java} | 22 +--
29 files changed, 590 insertions(+), 540 deletions(-)
diff --git
a/modules/spring-data-2.0/src/main/java/org/apache/ignite/springdata20/repository/support/IgniteRepositoryImpl.java
b/modules/spring-data-2.0/src/main/java/org/apache/ignite/springdata20/repository/support/IgniteRepositoryImpl.java
index e0a932e..c9cfded 100644
---
a/modules/spring-data-2.0/src/main/java/org/apache/ignite/springdata20/repository/support/IgniteRepositoryImpl.java
+++
b/modules/spring-data-2.0/src/main/java/org/apache/ignite/springdata20/repository/support/IgniteRepositoryImpl.java
@@ -17,7 +17,6 @@
package org.apache.ignite.springdata20.repository.support;
import java.io.Serializable;
-import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
@@ -30,6 +29,8 @@ import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.springdata20.repository.IgniteRepository;
import org.springframework.context.annotation.Conditional;
+import static java.util.Collections.emptySet;
+
/**
* General Apache Ignite repository implementation.
* This bean should've never been loaded by context directly, only via {@link
IgniteRepositoryFactory}
@@ -105,20 +106,37 @@ public class IgniteRepositoryImpl implements IgniteR
};
}
-/** {@inheritDoc} */
-@Override public Iterable findAllById(Iterable ids) {
+/**
+ * @param ids Collection of IDs.
+ * @return Collection transformed to set.
+ */
+private Set toSet(Iterable ids) {
if (ids instanceof Set)
-return cache.getAll((Set)ids).values();
+return (Set)ids;
+
+Iterator itr = ids.iterator();
+
+if (!itr.hasNext())
+return emptySet();
+
+ID key = itr.next();
+
+Set keys = key instanceof Comparable ? new TreeSet<>() : new
HashSet<>();
-if (ids instanceof Collection)
-return cache.getAll(new HashSet<>((Collection)ids)).values();
+keys.add(key);
-TreeSet keys = new TreeSet<>();
+while (itr.hasNext()) {
+key = itr.next();
-for (ID id : ids)
-keys.add(id);
+keys.add(key);
+}
-return cache.getAll(keys).values();
+return keys;
+}
+
+/** {@inheritDoc} */
+@Override public Iterable findAllById(Iterable ids)
[ignite] branch master updated: IGNITE-13081 Fix rest processor hanging on node shutdown if start failed #7859 - Fixes #7859.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 0971768 IGNITE-13081 Fix rest processor hanging on node shutdown if
start failed #7859 - Fixes #7859.
0971768 is described below
commit 09717684fb20e53afd984182da0acbf62eaf7dc3
Author: Semyon Danilov
AuthorDate: Mon Jun 1 13:35:31 2020 +0700
IGNITE-13081 Fix rest processor hanging on node shutdown if start failed
#7859 - Fixes #7859.
Signed-off-by: Alexey Kuznetsov
---
.../processors/rest/GridRestProcessor.java | 15 ++-
.../processors/rest/RestProcessorHangTest.java | 148 +
.../testsuites/IgniteRestHandlerTestSuite.java | 4 +-
3 files changed, 159 insertions(+), 8 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
index 0c4797e..02c8658 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
@@ -607,14 +607,15 @@ public class GridRestProcessor extends
GridProcessorAdapter implements IgniteRes
boolean interrupted = Thread.interrupted();
-while (workersCnt.sum() != 0) {
-try {
-Thread.sleep(200);
-}
-catch (InterruptedException ignored) {
-interrupted = true;
+if (!cancel)
+while (workersCnt.sum() != 0) {
+try {
+Thread.sleep(200);
+}
+catch (InterruptedException ignored) {
+interrupted = true;
+}
}
-}
U.interrupt(sesTimeoutCheckerThread);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorHangTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorHangTest.java
new file mode 100644
index 000..124934a
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorHangTest.java
@@ -0,0 +1,148 @@
+/*
+ * 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.processors.rest;
+
+import java.io.IOException;
+import java.net.Socket;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.IgnitionEx;
+import org.apache.ignite.internal.processors.rest.request.GridRestCacheRequest;
+import org.apache.ignite.spi.discovery.tcp.TestTcpDiscoverySpi;
+import
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+
+/**
+ * Test for rest processor hanging on stop.
+ */
+public class RestProcessorHangTest extends GridCommonAbstractTest {
+/**
+ * {@inheritDoc}
+ */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ConnectorConfiguration connectorConfiguration = new
ConnectorConfiguration();
+
+cfg.setConnectorConfiguration(connectorConfiguration);
+
+return cfg;
+}
+
+/**
+ * Test that node doesn't hang if there are rest requests and discovery
SPI failed.
+ *
+ * Description: Fire up one node that always rejects connections.
+ *
[ignite] branch master updated: IGNITE-12613 Wrong version of Scala library for Java 9+. - Fixes #7345.
This is an automated email from the ASF dual-hosted git repository. akuznetsov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git The following commit(s) were added to refs/heads/master by this push: new 0606f03 IGNITE-12613 Wrong version of Scala library for Java 9+. - Fixes #7345. 0606f03 is described below commit 0606f03d501777bb9c600ec8a20e472b1e336ee9 Author: vesi...@gridgain.com AuthorDate: Tue Feb 4 15:32:30 2020 +0300 IGNITE-12613 Wrong version of Scala library for Java 9+. - Fixes #7345. Signed-off-by: Alexey Kuznetsov --- parent/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 12398d0..1e85081 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1063,7 +1063,6 @@ 1.8 11 -2.12.6
[ignite] branch master updated: IGNITE-11716 Web console: Fixed template for "Eviction mode".
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 93c868b IGNITE-11716 Web console: Fixed template for "Eviction mode".
93c868b is described below
commit 93c868b4e323b33699aa51cb0330b56bd577359d
Author: Alexey Kuznetsov
AuthorDate: Thu May 30 14:05:51 2019 +0700
IGNITE-11716 Web console: Fixed template for "Eviction mode".
---
.../components/cluster-edit-form/templates/memory.pug | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/memory.pug
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/memory.pug
index 7016854..9fa53f5 100644
---
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/memory.pug
+++
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/memory.pug
@@ -165,11 +165,11 @@ ng-show='$ctrl.available(["2.0.0", "2.3.0"])'
model: '$item.pageEvictionMode',
name:
'"MemoryPolicyPageEvictionMode"',
placeholder: 'DISABLED',
-options: `[
-{value: "DISABLED", label:
"DISABLED"},
-{value: "RANDOM_LRU", label:
"RANDOM_LRU"},
-{value: "RANDOM_2_LRU", label:
"RANDOM_2_LRU"}
-]`,
+options: '[\
+{value: "DISABLED", label:
"DISABLED"},\
+{value: "RANDOM_LRU", label:
"RANDOM_LRU"},\
+{value: "RANDOM_2_LRU", label:
"RANDOM_2_LRU"}\
+]',
tip: 'An algorithm for memory
pages eviction\
\
DISABLED - Eviction is
disabled\
[ignite] branch gg-18375 deleted (was e04aee6)
This is an automated email from the ASF dual-hosted git repository. akuznetsov pushed a change to branch gg-18375 in repository https://gitbox.apache.org/repos/asf/ignite.git. was e04aee6 GG-18375 Merged with GG-18903. This change permanently discards the following revisions: discard e04aee6 GG-18375 Merged with GG-18903. discard 03b50ae GG-18375 Merged with GG-18321. discard b4b4a3a GG-18321 Fixed swagger, favicon. discard 900be76 GG-18321 Fixed all in one static. discard e736091 GG-18321 Fixed activation. discard dbffcc0 Merge branches 'gg-18321' and 'gg-18903' of https://github.com/gridgain/gridgain into gg-18903 discard 3ab4bb3 GG-18386 Alerts reimplemented. (#26) discard d1ba5c8 GG-18903 WIP Activities. discard aab1c7f GG-18903 WIP Activities. discard c7c3bb3 GG-18903 WIP Activities. discard 388e84b Merge branches 'gg-18321' and 'gg-18903' of https://github.com/gridgain/gridgain into gg-18903 discard 43e68c2 GG-18321 merged with master. discard 436e125 GG-18541: SQL: Introduce query memory quotas for LocalResults. This closes #40. discard 1b750b5 GG-18912 Fixed logout. discard 010ef56 GG-18903 WIP Activities. discard 70d4daf GG-18903 WIP Activities. discard 0c95af2 License header fix discard 630b76a GG-18906 Web Console: Fixed reconnect to next available node. discard 29273ba GG-18739 new test added to test suite discard 8905c3f GG-18877 additional heartbeat to prevent FailureProcessor from treating tcp-comm-worker as blocked discard e9bbe19 GG-18739 disable archiving + walCompactionEnabled probably broke reading from wal on server restart discard 7d285df GG-18598 Wrong location for ignite-h2 library (#48) discard 8e81c75 GG-18740 Debug log for the case when no WAL segment is found on restore. discard 02988aa GG-18918 Fix test that shown missed partitions during rebalancing. discard b669df3 GG-17373 Web Console: Added support for mocking web sockets calls for E2E tests. discard e90fb23 GG-18903 WIP Activities. discard 357712c GG-1 Fixed connection of Web Agent to server. Improved error message. (#47) discard 24a6018 GG-18321 Merged with master. discard 8858f0d GG-18828 GridCommandHandlerPasscodeAuthenticatorTest.testCacheIdleVerifyNodeFilter fails with AssertionError discard 05bda6b GG-18797: [IGNITE-11597] License fixed discard 892f020 GG-18895 Fixed incorrect test configuration in CacheFutureExceptionSelfTest discard de7ecc0 GG-18844 Increased number of clients in test. discard 544a37b GG-18853 More frequent heartbeat in db-checkpoint-thread. discard 3f28be8 GG-18689 Changes required to support ML Python API (#34) discard 3435b5f Merge pull request #35 from gridgain/gg-18748 discard 167cf09 GG-18539: SQL: Drop unnecessary H2 dependencies. discard 1db2faa GG-18375 WIP discard 8db0dd0 GG-17340 Added log information about inaccessible nodes within tcp communication discard 339b255 GG-18386 Merged branch gg-18386. discard 6b9d350 GG-18321 Fixed default. discard b3b8634 GG-18321 Added persistence. discard 7215439 GG-18321 Cleanup. discard 4db75e8 Merge branches 'gg-18321' and 'gg-18386' of https://github.com/gridgain/gridgain into gg-18386 discard b70e042 GG-18521 Integrate ReCaptcha validation into backend. (#31) discard 770ff34 GG-18386 Refactoring. discard 27fb5d4 GG-18848 Fixed detection of connected cluster. (#42) discard 14f0bfd GG-18769 Retry sending local partitions until message is sent or node is really dead. discard 1bce77e GG-17376: Fix issues related to IGNITE-10896 - Fixes #6535. discard f72b26d GG-17334 [IGNITE-11732] Fixed merged exchange future hang discard 3d81d8c GG-18838 Save selected cluster on stat action. (#41) discard cbc16ea GG-18794 Can't run example .Net with .Net docker node discard d03fe43 GG-18698: reduced log message in case: Topology projection is empty. Cluster group is empty. discard af681a5 GG-18797: [IGNITE-11597] Fix for Node.js thin client UUID marshalling discard 35169fb GG-18491 If docker virtual interface is present in system org.apache.ignite.internal.util.IgniteUtils#getLocalHost returns wrong InetAddress. (#21) discard 92634cf GG-18386 Merged gg-18321 branch. discard f0d98e1 GG-18684 Improve logging on partition map exchange. (#28) discard ba7bf85 GG-18596 Added extension points for account. discard 7a2a902 GG-18619: SQL: Publish QueryContext into H2 session. discard 69b56e7 GG-18682 Should to filtered indexes by cache name instead of validate all caches in group. (#29) discard 5a36345 GG-17429 synchronous execution of tx prepare in exchange thread was replaced with true async discard a78bb7d GG-18620 Added override in REST controllers to support EE/UE features. discard e231fc0 Merge branches 'gg-18321' and 'gg-18386' of https://github.com/gridgain/gridgain into gg-18386 discard 38f759a Update README.md discard 9e9e118 Update README.md discard 8f80378 GG-18748: Removed outdated javadoc. discard
[ignite] branch gg-18375 created (now e04aee6)
This is an automated email from the ASF dual-hosted git repository. akuznetsov pushed a change to branch gg-18375 in repository https://gitbox.apache.org/repos/asf/ignite.git. at e04aee6 GG-18375 Merged with GG-18903. This branch includes the following new commits: new 107ea3e GG-18321 Web Console: Java-based beta1. new 8a3710c Merge branches 'gg-18321' and 'master' of https://github.com/gridgain/gridgain into gg-18321 new 0f1f274 GG-18321 Web Console: Java-based beta1: fixed minor issues. new 27ccc61 GG-18321 Excluded spring-boot-devtools from release. new d7ff620 GG-18386 WIP Alerts. new 7abeaf0 GG-18386 WIP Alerts. new 1779f9f GG-18321 Fixed possible NPE. new 0d30894 Merge branches 'gg-18321' and 'master' of https://github.com/gridgain/gridgain into gg-18321 new 267a0a4 Merge branches 'gg-18321' and 'gg-18386' of https://github.com/gridgain/gridgain into gg-18386 new ba30532 GG-18576 Changed security settings. new 924eba8f GG-18386 WIP Alerts. new 287d64c GG-18517 Implement plugable email service. (#19) new b0f8283 GG-18574 Web console: Fixed selection of JDBC drivers on "Import domain models" modal. new c4c70a7 GG-18321 Merged with master. new aa9f9c4 GG-18599 Web Console: Fixed bug with saving local state of notebooks. new 4a6af3c GG-18592 Web Console: Fixed reset token logic. new 084eab8 Merge branches 'gg-18321' and 'gg-18386' of https://github.com/gridgain/gridgain into gg-18386 new edcbdcf GG-17465 Fix false-positive detection of cluster not idle state. Enrich DbCheckpointListener. Rework command handler tests hierarchy. new a1ffdfc Merge branches 'gg-18321' and 'master' of https://github.com/gridgain/gridgain into gg-18321 new aeb6a4d GG-18597 Web Console: Fixed cluster configuration removal. new 1dadce8 Merge branches 'gg-18321' and 'gg-18386' of https://github.com/gridgain/gridgain into gg-18386 new ac64436 GG-18567 fix new 7d04470 Revert "GG-18567 fix" new 40e56f6 GG-18386 WIP Alerts. new 883125f GG-18567 Discovery Compression check fails when nodes reconnect to cluster new 81a8066 GG-17337 [IGNITE-11579] Add new commands to deal with garbage in partitions which left after cache destroy in shared cache groups new 5341af5 GG-18622 [IGNITE-11780] Split command handler on hierarchy of commands new a2bf2e3 GG-17390 [IGNITE-11699] Node can't start after forced shutdown if the wal archiver disabled new 4b2d206 WC-1041 Cover some Angular form components with unit tests (#27) new 3111be5 GG-18502 Fixed "Expanded all" icon. new c92d4d2 GG-18508 Do not calc collapsed rows as visible. new fe0785a GG-18747 [.NET] Add EE and UE runnable docker image new 27dc6ba GG-18621 SQL map-step-related query logging for the debug level updated. new cf4e06a GG-18562 Fixed broken scenario during change PME coordinator to locally joining node new b51305e GG-18521 Merged master branch. new 54041af GG-17472 PVS: V6004 The 'then' statement is equivalent to the 'else' statement. IgniteTxManager (#22) new 7498257 GG-18759 Added redirect and default path static files. new 1a7d51c GG-18321 Minor cleanup. new 34bf883 GG-17390 [IGNITE-11699] License change: Node can't start after forced shutdown if the wal archiver disabled new dd2b09c GG-18321 Changed clientMode default. new 8f80378 GG-18748: Removed outdated javadoc. new 9e9e118 Update README.md new 38f759a Update README.md new e231fc0 Merge branches 'gg-18321' and 'gg-18386' of https://github.com/gridgain/gridgain into gg-18386 new a78bb7d GG-18620 Added override in REST controllers to support EE/UE features. new 5a36345 GG-17429 synchronous execution of tx prepare in exchange thread was replaced with true async new 69b56e7 GG-18682 Should to filtered indexes by cache name instead of validate all caches in group. (#29) new 7a2a902 GG-18619: SQL: Publish QueryContext into H2 session. new ba7bf85 GG-18596 Added extension points for account. new f0d98e1 GG-18684 Improve logging on partition map exchange. (#28) new 92634cf GG-18386 Merged gg-18321 branch. new 35169fb GG-18491 If docker virtual interface is present in system org.apache.ignite.internal.util.IgniteUtils#getLocalHost returns wrong InetAddress. (#21) new af681a5 GG-18797: [IGNITE-11597] Fix for Node.js thin client UUID marshalling new d03fe43 GG-18698: reduced log message in case: Topology projection is empty. Cluster group is empty. new cbc16ea GG-18794 Can't run example .Net with .Net docker node new 3d81d8c GG-18838 Save selected cluster on stat action. (#41) new f72b26d GG-17334 [IGNITE-11732] Fixed merged exchange future hang new 1bce77e GG-17376: Fix issues related to IGNITE-10896 - Fixes #6535.
[ignite] branch gg-18851 deleted (was eb2418a)
This is an automated email from the ASF dual-hosted git repository. akuznetsov pushed a change to branch gg-18851 in repository https://gitbox.apache.org/repos/asf/ignite.git. was eb2418a IGNITE-11636 Web console: Fixed cluster switch logic. #6352 This change permanently discards the following revisions: discard eb2418a IGNITE-11636 Web console: Fixed cluster switch logic. #6352 discard 4b69888 GG-18848 Fixed detection of connected cluster. (#42) discard 4f41714 GG-18838 Save selected cluster on stat action. (#41) discard 1e8c8fe GG-17390 [IGNITE-11699] Node can't start after forced shutdown if the wal archiver disabled discard 3b5a0a7 GG-18794 Can't run example .Net with .Net docker node discard bbdee80 IGNITE-11589 Fix GridDhtPartitionsExchangeFuture remained incompleted in some circumstances - Fixes #6316. discard a9dc5f3 GG-18747 [.NET] Add EE and UE runnable docker image discard 50766d5 GG-18567 Discovery Compression check fails when nodes reconnect to cluster discard 8e91050 GG-17470 Backport of GG-16776 multiplier for wal archive size adjustment changed discard 88bf9dc GG-17405 Web Console: [Mail] Failed to run web console with mail server discard 9dfd9fb IGNITE-11299 Avoid busy wait on processWrite during SSL handshake. discard 2fe0337 IGNITE-11595 Fix broken Javadoc stylesheet (#6322) discard 379b165 GG-17383 [IGNITE-11805] .NET: Add runnable .NET Core assembly, add Dockerfile (#6501) discard ab1e6c0 GG-17375 Web Console: Implemented support for Mongo 4.x and latest Ubuntu. Co-authored-by: Vasiliy Sisko Co-authored-by: Andrey Novikov Co-authored-by: Ilya Murchenko discard a97f040 GG-17429 DR: possible deadlock at startup discard 9ea556b GG-17434 Fix memory leak on unstable topology caused by partition reservation discard de8f0e47 GG-17475 Port [IGNITE-11202] SQL: Move partition reservation logic to separate class discard 13c87ce GG-16776 multiplier for wal archive size adjustment changed discard f871f10 GG-17424 Disable by default bash pipefail/errexit/nounset options from Ignite startup scripts discard f060e5e License is updated again. discard f8a3a95 Removed unused files discard 05d27fa License is updated. discard 1d6899a IGNITE-9228: Spark SQL Table Schema Specification - Fixes #4551. discard c814dd9 GG-17451 JavaDoc build failure discard 190cfd7 GridDeploymentSelfTest is fixed. discard 314e2ff GG-17377 Web Console: Cherry-picked missing commit: 921412dec84e19863cd499614197b7029b0f9959. discard 4c1eb8c Fixed license. discard 42ef9ef IGNITE-11641 Fixed server node copies a lot of WAL files in WAL archive after restart discard 80c170e IGNITE-11730 Discovery Compression check fails when nodes reconnect to cluster - Fixes #6438. discard 4580bd5 IGNITE-11754 Fixed memory leak in TxFinishSync - Fixes #6462. discard 62c8ed6 Revert "IGNITE-1903 Do not deserialize cache configurations on non-affinity nodes - Fixes #6393." discard 81525d7 IGNITE-11767 Clean up GridDhtPartitionsFullMessage when not needed, do not hold decompressed partsSizes in field. discard a284a8e IGNITE-11726: SQL: must not store default precision and scale in the QueryEntity for CHAR/VARCHAR and DECIMAL types. This closes #6437. discard b1b84d0 IGNITE-11743 Keep cache descriptor available until cache is stopped - Fixes #6470. discard 01699f1 group id fix. discard 9ee9381 IGNITE-11755: Memory leak H2 connections at the ConnectionManager#detachedConns. discard 3cdac5d Removed unused file discard 515f4a6 Fixed groupId. discard b0f7dbf IGNITE-1903 Do not deserialize cache configurations on non-affinity nodes - Fixes #6393. discard 22ee13f IGNITE-11392 Improve LRT diagnostic messages discard fb0ba18 License update part 1. discard 0c3f73d IGNITE-11155 Add JVM options analysis to Ignition.start() or handle and comment exceptions (#6054) discard f216014 IGNITE-11600: Fix GridUnsafe for Java 12: Selective prioritized approaches to allocate a direct buffer (#6384) discard 39a368a IGNITE-11600: Fix launch scripts for Java 12 (#6326) discard fbdea44 Revert "IGNITE-11600 Fix launch script for Java 12 (#6323)" discard c62989d IGNITE-11600 Fix launch script for Java 12 (#6323) discard f57c251 IGNITE-11738 Incorrect check ObjectInput.available() in CacheMetricsSnapshot discard 46dfa81 Revert "fix oom" discard e0d83a1 fix oom discard 90bc529 Fixed org.apache.ignite => org.gridgain renaming discard 3e9c415 IGNITE-11127 Handling GridDhtInvalidPartitionException by GridCacheTtlManager. discard bff0e63 IGNITE-11617 New exchange coordinator skips client fast reply for previous exchange - Fixes #6332. discard da058e9 IGNITE-11621 Fixed infinite 'no next node in topology' loop in case of connecting nodes - Fixes #6360. discard 422f0eb IGNITE-10669 Properly handle free list corruption errors - Fixes #6207. discard 18bf278 IGNITE-11439: MVCC: Error in transaction mo
[ignite] branch gg-18851 created (now eb2418a)
This is an automated email from the ASF dual-hosted git repository. akuznetsov pushed a change to branch gg-18851 in repository https://gitbox.apache.org/repos/asf/ignite.git. at eb2418a IGNITE-11636 Web console: Fixed cluster switch logic. #6352 This branch includes the following new commits: new a193f69 Uber patch for CE (based on 8.7.3 changes): new 2b724f6 IGNITE-11541 Static cache configuration should not override persisted configuration - Fixes #6318. new 087176d IGNITE-11531 Merge concurrent registrations of the same binary type - Fixes #6261. new 4a7afa6 IGNITE-11605 Recheck metadata difference after put pending future - Fixes #6324. new 99aefaa IGNITE-11384 Introduce an ability of services hot redeployment via DeploymentSpi new beedbea IGN-10411 Backport IGNITE-8376 Cluster activation events added - Fixes #6235. new 2ea2686 IGNITE-10138 Provide description for operations of org.apache.ignite.mxbean.TransactionMetricsMxBean - Fixes #5817. new ba33484 IGN-13752. Backport IGNITE-10856 Upgrade cassandra driver version to fix Guava conflict - Fixes #5780. new 52bec2f IGNITE-11598 Added ability to have different rebalance thread pool size on different nodes in cluster - Fixes #6357. new 813c7f9 IGNITE-11380 Add support of JAR files to UriDeploymentSpi - Fixes #6177. new f00de42 IGNITE-11599 Thin client to find valid node for connection from the configuration list - Fixes #6368. new da2f912 IGNITE-11629 Make sure Cassandra driver dependencies present in redistributable. new 18900da IGNITE-11631 Fix NPE on server node start and persistence - Fixes #6344. new df75952 IGNITE-11632 Correctly handle crc errors in no archiver mode - Fixes #6345. new b4913b8 IGNITE-11634: SQL: Fixed anonymous class handling in DmlStatementsProcessor. This closes #6349. new b2888e4 IGNITE-11660 Choose correct closure in DmlStatementsProcessorTest, more tests - Fixes #6379. new 866637a IGNITE-11614 Fix transaction hang when sessionEnd throws an exception - Fixes #6401. new 9d8b95d IGNITE-11484 Get rid of ForkJoinPool#commonPool usage for system critical task - Fixes #6243. new f0ec4d8 IGNITE-10997 Add new property to DataRegionMetrics: empty pages count in reuseList. - Fixes #6319. new c577a09 IGNITE-10997 Fixed @deprecated tag in javadoc new 6f8f8d7 IGNITE-11536 Add information about possible long GC pause to checkpoint started message. - Fixes #6276. new 958a196 IGNITE-11640 Fix hang on node stop caused by an incomplete checkpoint future - Fixes #6355. new f391e07 IGNITE-11606 Fix index update after index.bin manual removal - Fixes #6325. new 18bf278 IGNITE-11439: MVCC: Error in transaction mode validation. This closes #6397. new 422f0eb IGNITE-10669 Properly handle free list corruption errors - Fixes #6207. new da058e9 IGNITE-11621 Fixed infinite 'no next node in topology' loop in case of connecting nodes - Fixes #6360. new bff0e63 IGNITE-11617 New exchange coordinator skips client fast reply for previous exchange - Fixes #6332. new 3e9c415 IGNITE-11127 Handling GridDhtInvalidPartitionException by GridCacheTtlManager. new 90bc529 Fixed org.apache.ignite => org.gridgain renaming new e0d83a1 fix oom new 46dfa81 Revert "fix oom" new f57c251 IGNITE-11738 Incorrect check ObjectInput.available() in CacheMetricsSnapshot new c62989d IGNITE-11600 Fix launch script for Java 12 (#6323) new fbdea44 Revert "IGNITE-11600 Fix launch script for Java 12 (#6323)" new 39a368a IGNITE-11600: Fix launch scripts for Java 12 (#6326) new f216014 IGNITE-11600: Fix GridUnsafe for Java 12: Selective prioritized approaches to allocate a direct buffer (#6384) new 0c3f73d IGNITE-11155 Add JVM options analysis to Ignition.start() or handle and comment exceptions (#6054) new fb0ba18 License update part 1. new 22ee13f IGNITE-11392 Improve LRT diagnostic messages new b0f7dbf IGNITE-1903 Do not deserialize cache configurations on non-affinity nodes - Fixes #6393. new 515f4a6 Fixed groupId. new 3cdac5d Removed unused file new 9ee9381 IGNITE-11755: Memory leak H2 connections at the ConnectionManager#detachedConns. new 01699f1 group id fix. new b1b84d0 IGNITE-11743 Keep cache descriptor available until cache is stopped - Fixes #6470. new a284a8e IGNITE-11726: SQL: must not store default precision and scale in the QueryEntity for CHAR/VARCHAR and DECIMAL types. This closes #6437. new 81525d7 IGNITE-11767 Clean up GridDhtPartitionsFullMessage when not needed, do not hold decompressed partsSizes in field. new 62c8ed6 Revert "IGNITE-1903 Do not deserialize cache configurations on non-affinity nodes - Fixes #6393." new 4580bd5 IGNITE-11754 Fixed memory leak in TxFinishSync - Fixes #6462. ne
[ignite] branch master updated: IGNITE-10538 Web Console: Fixed "no-data" component style.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new a06f516 IGNITE-10538 Web Console: Fixed "no-data" component style.
a06f516 is described below
commit a06f516818461846dd64b707525a2da2855fe64c
Author: Ilya Borisov
AuthorDate: Tue Apr 23 10:57:11 2019 +0700
IGNITE-10538 Web Console: Fixed "no-data" component style.
---
.../components/page-queries/components/queries-notebooks-list/style.scss | 1 -
1 file changed, 1 deletion(-)
diff --git
a/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/style.scss
b/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/style.scss
index 6cdbd39..10fd40a 100644
---
a/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/style.scss
+++
b/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/style.scss
@@ -23,7 +23,6 @@
.queries-notebooks-list {
grid-no-data {
-top: -6px;
background: white;
}
[ignite] branch master updated: IGNITE-5461 Web Console: Minor fix of cluster version extraction.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new fd3f7613 IGNITE-5461 Web Console: Minor fix of cluster version
extraction.
fd3f7613 is described below
commit fd3f76131b5823226918a4118b7b7cdea5dc109a
Author: Alexey Kuznetsov
AuthorDate: Wed Apr 17 16:07:17 2019 +0700
IGNITE-5461 Web Console: Minor fix of cluster version extraction.
---
.../app/modules/agent/AgentManager.service.js | 12 +++--
.../frontend/app/modules/cluster/Node.js | 54 --
2 files changed, 8 insertions(+), 58 deletions(-)
diff --git
a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
index 1156844..04a7dbc 100644
--- a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
+++ b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
@@ -18,8 +18,8 @@
import _ from 'lodash';
import {nonEmpty, nonNil} from 'app/utils/lodashMixins';
-import {timer, BehaviorSubject, of, from} from 'rxjs';
-import {exhaustMap, first, pluck, tap, distinctUntilChanged, map, filter,
expand, takeWhile, last} from 'rxjs/operators';
+import {BehaviorSubject} from 'rxjs';
+import {first, pluck, tap, distinctUntilChanged, map, filter} from
'rxjs/operators';
import io from 'socket.io-client';
@@ -225,7 +225,7 @@ export default class AgentManager {
if (!this.isDemoMode()) {
this.connectionSbj.subscribe({
next: ({cluster}) => {
-const version = _.get(cluster, 'clusterVersion');
+const version = this.getClusterVersion(cluster);
if (_.isEmpty(version))
return;
@@ -240,6 +240,10 @@ export default class AgentManager {
return this.$root.IgniteDemoMode;
}
+getClusterVersion(cluster) {
+return _.get(cluster, 'clusterVersion');
+}
+
available(...sinceVersion) {
return this.Version.since(this.clusterVersion, ...sinceVersion);
}
@@ -294,7 +298,7 @@ export default class AgentManager {
if (!_.isNil(oldCluster)) {
oldCluster.nids = newCluster.nids;
oldCluster.addresses = newCluster.addresses;
-oldCluster.clusterVersion = newCluster.clusterVersion;
+oldCluster.clusterVersion = this.getClusterVersion(newCluster);
oldCluster.active = newCluster.active;
this.connectionSbj.next(state);
diff --git a/modules/web-console/frontend/app/modules/cluster/Node.js
b/modules/web-console/frontend/app/modules/cluster/Node.js
deleted file mode 100644
index dac7c70..000
--- a/modules/web-console/frontend/app/modules/cluster/Node.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.
- */
-
-export default class Node {
-constructor(node) {
-this.nid = node.nodeId.toUpperCase();
-
-this.jvmPid = node.attributes['org.apache.ignite.jvm.pid'];
-this.macs = node.attributes['org.apache.ignite.macs'];
-
-this.ip = node.attributes['org.apache.ignite.ips'].split(',')[0];
-this.igniteVersion = node.attributes['org.apache.ignite.build.ver'];
-this.version = node.attributes['plugins.gg.build.ver'] ||
this.igniteVersion;
-// this.hostName = data.attributes[];
-this.clientMode = node.attributes['org.apache.ignite.cache.client'] ?
'CLIENT' : 'SERVER';
-this.gridName = node.attributes['org.apache.ignite.ignite.name'];
-
-this.startTime = node.metrics.startTime;
-this.upTime = node.metrics.upTime;
-
-this.cpus = node.metrics.totalCpus;
-
-this.heapMemoryMaximum = parseInt(node.metrics.heapMemoryMaximum, 10);
-this.heapMemoryUsed = parseInt(node.metrics.heapMemoryUsed, 10);
-this.heapMemoryCommitted = parseInt(node.metrics.heapMemoryCommitted,
10);
-
-this.busy = parseFloat(node.metrics.busyTimePercentage);
-
-th
[ignite] branch master updated: IGNITE-11742 Web console: Fixed "grid-showing-rows" component in grids with no selection. Fixes #6450.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new fa54df9 IGNITE-11742 Web console: Fixed "grid-showing-rows" component
in grids with no selection. Fixes #6450.
fa54df9 is described below
commit fa54df94692d5c2ea504e3fef0ab86c541561234
Author: Ilya Borisov
AuthorDate: Mon Apr 15 18:40:09 2019 +0700
IGNITE-11742 Web console: Fixed "grid-showing-rows" component in grids with
no selection. Fixes #6450.
---
.../frontend/app/components/grid-showing-rows/controller.js| 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git
a/modules/web-console/frontend/app/components/grid-showing-rows/controller.js
b/modules/web-console/frontend/app/components/grid-showing-rows/controller.js
index b9e2e8e..31d09bb 100644
---
a/modules/web-console/frontend/app/components/grid-showing-rows/controller.js
+++
b/modules/web-console/frontend/app/components/grid-showing-rows/controller.js
@@ -35,12 +35,18 @@ export default class {
this.gridApi.core.on.rowsVisibleChanged(this.$scope, () => {
this.applyValues();
});
-this.gridApi.selection.on.rowSelectionChanged(this.$scope, () =>
this.updateSelectedCount());
-this.gridApi.selection.on.rowSelectionChangedBatch(this.$scope, ()
=> this.updateSelectedCount());
+
+if (this.gridApi.selection) {
+this.gridApi.selection.on.rowSelectionChanged(this.$scope, ()
=> this.updateSelectedCount());
+
this.gridApi.selection.on.rowSelectionChangedBatch(this.$scope, () =>
this.updateSelectedCount());
+}
}
}
updateSelectedCount() {
+if (!this.gridApi.selection)
+return;
+
this.selected = this.gridApi.selection.getSelectedCount();
}
[ignite] branch master updated: IGNITE-11717 Web console: Fixed project generation. Fixes #6443.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 17753e2 IGNITE-11717 Web console: Fixed project generation. Fixes
#6443.
17753e2 is described below
commit 17753e25c95bbf3645b65b558e862eb057dcfa9a
Author: Vasiliy Sisko
AuthorDate: Mon Apr 15 14:40:05 2019 +0700
IGNITE-11717 Web console: Fixed project generation. Fixes #6443.
---
.../generator/generator/ConfigurationGenerator.js | 18 +-
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git
a/modules/web-console/frontend/app/configuration/generator/generator/ConfigurationGenerator.js
b/modules/web-console/frontend/app/configuration/generator/generator/ConfigurationGenerator.js
index 07d3e79..c2057e0 100644
---
a/modules/web-console/frontend/app/configuration/generator/generator/ConfigurationGenerator.js
+++
b/modules/web-console/frontend/app/configuration/generator/generator/ConfigurationGenerator.js
@@ -1426,6 +1426,7 @@ export default class IgniteConfigurationGenerator {
loadBalancingSpi.boolProperty('perTask');
break;
+
case 'Adaptive':
loadBalancingSpi = new
Bean('org.apache.ignite.spi.loadbalancing.adaptive.AdaptiveLoadBalancingSpi',
'loadBalancingSpiAdaptive', spi.Adaptive);
@@ -1438,6 +1439,7 @@ export default class IgniteConfigurationGenerator {
probeBean.boolProperty('useAverage');
break;
+
case 'CPU':
probeBean = new
Bean('org.apache.ignite.spi.loadbalancing.adaptive.AdaptiveCpuLoadProbe',
'cpuProbe', spi.Adaptive.loadProbe.CPU,
clusterDflts.loadBalancingSpi.Adaptive.loadProbe.CPU);
@@ -1446,12 +1448,14 @@ export default class IgniteConfigurationGenerator {
.intProperty('processorCoefficient');
break;
+
case 'ProcessingTime':
probeBean = new
Bean('org.apache.ignite.spi.loadbalancing.adaptive.AdaptiveProcessingTimeLoadProbe',
'timeProbe', spi.Adaptive.loadProbe.ProcessingTime,
clusterDflts.loadBalancingSpi.Adaptive.loadProbe.ProcessingTime);
probeBean.boolProperty('useAverage');
break;
+
case 'Custom':
const className = _.get(spi,
'Adaptive.loadProbe.Custom.className');
@@ -1459,6 +1463,7 @@ export default class IgniteConfigurationGenerator {
probeBean = new Bean(className, 'probe',
spi.Adaptive.loadProbe.Job.Custom);
break;
+
default:
// No-op.
}
@@ -1467,6 +1472,7 @@ export default class IgniteConfigurationGenerator {
loadBalancingSpi.beanProperty('loadProbe', probeBean);
break;
+
case 'WeightedRandom':
loadBalancingSpi = new
Bean('org.apache.ignite.spi.loadbalancing.weightedrandom.WeightedRandomLoadBalancingSpi',
'loadBalancingSpiRandom', spi.WeightedRandom,
clusterDflts.loadBalancingSpi.WeightedRandom);
@@ -1474,13 +1480,15 @@ export default class IgniteConfigurationGenerator {
.boolProperty('useWeights');
break;
+
case 'Custom':
-const className = _.get(spi, 'Custom.className');
+const cusClassName = _.get(spi, 'Custom.className');
-if (className)
-loadBalancingSpi = new Bean(className,
'loadBalancingSpiCustom', spi.Custom);
+if (cusClassName)
+loadBalancingSpi = new Bean(cusClassName,
'loadBalancingSpiCustom', spi.Custom);
break;
+
default:
// No-op.
}
@@ -2816,7 +2824,7 @@ export default class IgniteConfigurationGenerator {
bean = new
Bean('org.apache.ignite.hadoop.util.ChainedUserNameMapper', 'mameMapper',
mapper.Chained);
bean.arrayProperty('mappers', 'mappers',
-_.map(_.get(mapper, 'Chained.mappers'),
IgniteConfigurationGenerator._userNameMapperBean),
+_.filter(_.map(_.get(mapper, 'Chained.mappers'),
IgniteConfigurationGenerator._userNameMapperBean), (m) => m),
'org.apache.ignite.hadoop.util.UserNameMapper');
break;
@@ -2872,7 +2880,7 @@ export default class IgniteConfigurationGenerator {
break;
case 'Custom':
-if (_get(secondFs, 'Custom.className'))
+if (_.
[ignite] branch master updated: IGNITE-11711 Web console: Fixed visibility logic for "JDBC driver download link".
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 6fd5a76 IGNITE-11711 Web console: Fixed visibility logic for "JDBC
driver download link".
6fd5a76 is described below
commit 6fd5a7622e3ad5e8c0b02a302b7a7a5d0d4dd007
Author: Vasiliy Sisko
AuthorDate: Fri Apr 12 13:34:42 2019 +0700
IGNITE-11711 Web console: Fixed visibility logic for "JDBC driver download
link".
---
.../components/cache-edit-form/templates/store.pug| 4 ++--
.../components/cluster-edit-form/templates/checkpoint/jdbc.pug| 2 +-
.../cluster-edit-form/templates/general/discovery/jdbc.pug| 2 +-
modules/web-console/frontend/app/configuration/services/Caches.ts | 8
.../web-console/frontend/app/configuration/services/Clusters.ts | 8
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/store.pug
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/store.pug
index b4baac5..42153d8 100644
---
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/store.pug
+++
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/store.pug
@@ -86,7 +86,7 @@ panel-collapsible(ng-form=form
on-open=`ui.loadPanel('${form}')`)
change:`$ctrl.clearImplementationVersion(${pojoStoreFactory})`
})
.pc-form-grid-col-60(ng-if=`$ctrl.Caches.requiresProprietaryDrivers(${pojoStoreFactory})`)
-a.link-success(ng-href=`{{
$ctrl.Caches.JDBCDriverURL(${pojoStoreFactory}) }}` target='_blank')
+a.link-success(ng-href=`{{
$ctrl.Caches.jdbcDriverURL(${pojoStoreFactory}) }}` target='_blank')
| Download JDBC drivers?
.pc-form-grid-col-30
+form-field__number({
@@ -223,7 +223,7 @@ panel-collapsible(ng-form=form
on-open=`ui.loadPanel('${form}')`)
placeholder: 'Choose database'
})
.pc-form-grid-col-60(ng-if=`$ctrl.Caches.requiresProprietaryDrivers(${blobStoreFactory})`)
-a.link-success(ng-href=`{{
$ctrl.Caches.JDBCDriverURL(${blobStoreFactory}) }}` target='_blank')
+a.link-success(ng-href=`{{
$ctrl.Caches.jdbcDriverURL(${blobStoreFactory}) }}` target='_blank')
| Download JDBC drivers?
.pc-form-grid-col-60
+form-field__checkbox({
diff --git
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint/jdbc.pug
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint/jdbc.pug
index ed5f148..945f54d 100644
---
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint/jdbc.pug
+++
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint/jdbc.pug
@@ -38,7 +38,7 @@ include /app/helpers/jade/mixins
placeholder: 'Choose JDBC dialect'
})
.pc-form-grid-col-60(ng-if='$ctrl.Clusters.requiresProprietaryDrivers($checkpointSPI.JDBC)')
-a.link-success(ng-href='{{
$ctrl.Clusters.JDBCDriverURL($checkpointSPI.JDBC) }}' target='_blank')
+a.link-success(ng-href='{{
$ctrl.Clusters.jdbcDriverURL($checkpointSPI.JDBC) }}' target='_blank')
| Download JDBC drivers?
.pc-form-grid-col-60
+form-field__java-class({
diff --git
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/jdbc.pug
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/jdbc.pug
index a285408..e82814f 100644
---
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/jdbc.pug
+++
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/jdbc.pug
@@ -48,5 +48,5 @@ mixin discovery-jdbc(modelAt = '$ctrl.clonedCluster')
tip: 'Flag indicating whether DB schema should be initialized
by Ignite or was explicitly created by user'
})
.pc
[ignite] branch master updated: IGNITE-9981 Web Console: Implemented advanced footer for grid.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 0d7070d IGNITE-9981 Web Console: Implemented advanced footer for grid.
0d7070d is described below
commit 0d7070dbde1b354f5f14ae3f55f87c9c16be3ea7
Author: Ilya Borisov
AuthorDate: Thu Apr 11 10:22:42 2019 +0700
IGNITE-9981 Web Console: Implemented advanced footer for grid.
---
.../app/components/grid-showing-rows/component.js | 6 +--
.../app/components/grid-showing-rows/controller.js | 56 --
.../app/components/grid-showing-rows/style.scss| 4 ++
.../components/grid-showing-rows/template.tpl.pug | 24 ++
4 files changed, 83 insertions(+), 7 deletions(-)
diff --git
a/modules/web-console/frontend/app/components/grid-showing-rows/component.js
b/modules/web-console/frontend/app/components/grid-showing-rows/component.js
index 6cab628..ecb93d0 100644
--- a/modules/web-console/frontend/app/components/grid-showing-rows/component.js
+++ b/modules/web-console/frontend/app/components/grid-showing-rows/component.js
@@ -18,10 +18,10 @@
import './style.scss';
import controller from './controller';
+import templateUrl from './template.tpl.pug';
+
export default {
-template: `
-
-`,
+templateUrl,
controller,
bindings: {
gridApi: '<'
diff --git
a/modules/web-console/frontend/app/components/grid-showing-rows/controller.js
b/modules/web-console/frontend/app/components/grid-showing-rows/controller.js
index 67c407c..b9e2e8e 100644
---
a/modules/web-console/frontend/app/components/grid-showing-rows/controller.js
+++
b/modules/web-console/frontend/app/components/grid-showing-rows/controller.js
@@ -18,12 +18,14 @@
import _ from 'lodash';
export default class {
-static $inject = ['$scope', 'uiGridConstants'];
+static $inject = ['$scope', 'IgniteCopyToClipboard',
'uiGridExporterService', 'uiGridExporterConstants', 'IgniteMessages', 'CSV'];
-constructor($scope, uiGridConstants) {
-Object.assign(this, {$scope, uiGridConstants});
+constructor($scope, IgniteCopyToClipboard, uiGridExporterService,
uiGridExporterConstants, IgniteMessages, CSV) {
+Object.assign(this, {$scope, IgniteCopyToClipboard,
uiGridExporterService, uiGridExporterConstants, IgniteMessages, CSV});
this.count = 0;
+this.visible = 0;
+this.selected = 0;
}
$onChanges(changes) {
@@ -33,15 +35,61 @@ export default class {
this.gridApi.core.on.rowsVisibleChanged(this.$scope, () => {
this.applyValues();
});
+this.gridApi.selection.on.rowSelectionChanged(this.$scope, () =>
this.updateSelectedCount());
+this.gridApi.selection.on.rowSelectionChangedBatch(this.$scope, ()
=> this.updateSelectedCount());
}
}
+updateSelectedCount() {
+this.selected = this.gridApi.selection.getSelectedCount();
+}
+
applyValues() {
if (!this.gridApi.grid.rows.length) {
this.count = 0;
+this.visible = 0;
+this.selected = 0;
return;
}
-this.count = _.sumBy(this.gridApi.grid.rows, (row) =>
Number(row.visible));
+this.count = this.gridApi.grid.rows.length;
+this.visible = _.sumBy(this.gridApi.grid.rows, (row) =>
Number(row.visible));
+this.updateSelectedCount();
+}
+
+copyToClipBoard() {
+if (this.count === 0 || !this.gridApi) {
+this.IgniteMessages.showError('No data to be copied');
+return;
+}
+
+const data = [];
+const grid = this.gridApi.grid;
+grid.options.exporterSuppressColumns = [];
+const exportColumnHeaders =
this.uiGridExporterService.getColumnHeaders(grid,
this.uiGridExporterConstants.VISIBLE);
+
+grid.rows.forEach((row) => {
+if (!row.visible)
+return;
+
+const values = [];
+
+exportColumnHeaders.forEach((exportCol) => {
+const col = grid.columns.find(({ field }) => field ===
exportCol.name);
+
+if (!col || !col.visible || col.colDef.exporterSuppressExport
=== true)
+return;
+
+const value = grid.getCellValue(row, col);
+
+values.push({ value });
+});
+
+data.push(values);
+});
+
+const csvContent =
this.uiGridExporterService.formatAsCsv(exportColumnHeaders, data,
this.CSV.getSeparator());
+
+this.IgniteCopyToClipboard.copy(csvContent);
}
}
diff --git
a/modules/web-console/frontend/app/components/grid-showing-rows/style.scss
b/modules/web-console/frontend/app/components/grid-showing-rows/style.scss
index a37f1b5..5893a08 100644
--- a/modules/web-console/f
[ignite] branch master updated: IGNITE-11716 Web console: Fixed typo in template for "Eviction mode".
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new e6f7dad IGNITE-11716 Web console: Fixed typo in template for
"Eviction mode".
e6f7dad is described below
commit e6f7dad846881722654285735fffa27c5ab007d6
Author: Alexey Kuznetsov
AuthorDate: Thu Apr 11 10:05:43 2019 +0700
IGNITE-11716 Web console: Fixed typo in template for "Eviction mode".
---
.../components/cluster-edit-form/templates/memory.pug | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/memory.pug
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/memory.pug
index cfdeb98..7016854 100644
---
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/memory.pug
+++
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/memory.pug
@@ -165,11 +165,11 @@ ng-show='$ctrl.available(["2.0.0", "2.3.0"])'
model: '$item.pageEvictionMode',
name:
'"MemoryPolicyPageEvictionMode"',
placeholder: 'DISABLED',
-options: '[\
-{value: "DISABLED", label:
"DISABLED"},\
-{value: "RANDOM_LRU", label:
"RANDOM_LRU"},\
-[value: "RANDOM_2_LRU", label:
"RANDOM_2_LRU"}\
-]',
+options: `[
+{value: "DISABLED", label:
"DISABLED"},
+{value: "RANDOM_LRU", label:
"RANDOM_LRU"},
+{value: "RANDOM_2_LRU", label:
"RANDOM_2_LRU"}
+]`,
tip: 'An algorithm for memory
pages eviction\
\
DISABLED - Eviction is
disabled\
[ignite] branch master updated: IGNITE-11710 Web Console: Exposed callback to ui-grid.api for manipulations with ui-grid.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 0512e86 IGNITE-11710 Web Console: Exposed callback to ui-grid.api for
manipulations with ui-grid.
0512e86 is described below
commit 0512e8638c3671e8b0c8be3dae6b4d59f9c56919
Author: Alexander Kalinin
AuthorDate: Wed Apr 10 11:44:23 2019 +0700
IGNITE-11710 Web Console: Exposed callback to ui-grid.api for manipulations
with ui-grid.
---
.../app/components/grid-item-selected/controller.js | 2 +-
.../frontend/app/components/ui-grid/component.js | 3 ++-
.../frontend/app/components/ui-grid/controller.js| 3 +++
.../frontend/app/components/ui-grid/style.scss | 16
4 files changed, 6 insertions(+), 18 deletions(-)
diff --git
a/modules/web-console/frontend/app/components/grid-item-selected/controller.js
b/modules/web-console/frontend/app/components/grid-item-selected/controller.js
index 3803c96..ab35849 100644
---
a/modules/web-console/frontend/app/components/grid-item-selected/controller.js
+++
b/modules/web-console/frontend/app/components/grid-item-selected/controller.js
@@ -23,7 +23,7 @@ export default class {
}
$onChanges(changes) {
-if (changes && 'gridApi' in changes && changes.gridApi.currentValue) {
+if (changes && 'gridApi' in changes && changes.gridApi.currentValue &&
this.gridApi.selection) {
this.applyValues();
this.gridApi.grid.registerDataChangeCallback(() =>
this.applyValues(), [this.uiGridConstants.dataChange.ROW]);
diff --git a/modules/web-console/frontend/app/components/ui-grid/component.js
b/modules/web-console/frontend/app/components/ui-grid/component.js
index 11ce4d7..cb9a927 100644
--- a/modules/web-console/frontend/app/components/ui-grid/component.js
+++ b/modules/web-console/frontend/app/components/ui-grid/component.js
@@ -43,6 +43,7 @@ export default {
selectedRowsId: '
api.core.handleWindowResize());
this.resizeObserver.observe(this.$element[0]);
+
+if (this.onApiRegistered)
+this.onApiRegistered({$event: api});
}
};
diff --git a/modules/web-console/frontend/app/components/ui-grid/style.scss
b/modules/web-console/frontend/app/components/ui-grid/style.scss
index d3b8c05..85ce77b 100644
--- a/modules/web-console/frontend/app/components/ui-grid/style.scss
+++ b/modules/web-console/frontend/app/components/ui-grid/style.scss
@@ -43,22 +43,6 @@ ignite-grid-table {
}
}
-.ui-grid.ui-grid--ignite.ui-grid--thin-rows {
-.ui-grid-row {
-height: 36px !important;
-
-.ui-grid-cell {
-height: 100% !important;
-}
-}
-
-.ui-grid-cell .ui-grid-cell-contents {
-padding: 8px 20px !important;
-min-height: 35px !important;
-max-height: 35px !important;
-}
-}
-
.ui-grid.ui-grid--ignite:not(.ui-grid--thin) {
// Start section row height.
.ui-grid-row {
[ignite] branch ignite-wc-935 deleted (was a3a5bf5)
This is an automated email from the ASF dual-hosted git repository. akuznetsov pushed a change to branch ignite-wc-935 in repository https://gitbox.apache.org/repos/asf/ignite.git. was a3a5bf5 WC-935 WIP. This change permanently discards the following revisions: discard a3a5bf5 WC-935 WIP. discard 5b12b47 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-wc-999 discard fa0efe9 WC-1018 Reworked Notebooks to Spring Boot. discard 9ce4dcd WC-999 Merged with master. discard d027306 WC-1006 Web Console: Implemented websocket support. discard ce5e523 WC-999 Merged with master. discard 53d6a39 WC-1016 Implement storing web session in cache. (#146) discard 8c5b9b3 WC-999 Minor fix after WC-1005 merge. discard 57893b8 WC-999 Merged with master. discard 16ab67c WC-1005 Implemented Signin, signup, logout (#143) discard 5ec4ecd WC-999 Changed port. discard 3660012 WC-999 WIP discard a8423dd WC-999 WIP. discard 04945a9 WC-999 WIP. discard f317165 WC-999 Started boot 2. discard 9a3f21f WC-999 Try spring boot 2 discard 7fa1ef2 WC-999 Try spring boot 2 discard 5dcea67 WC-960 Implement REST endpoint permissions. (#138) discard 70eacf9 WC-947 Implement Docker images for Java-based Web Console. (#134) discard ee3b9fc IGNITE-5617 Merged with master. discard 2d56268 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 discard 7fa3e1e Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 discard c05501a WC-935 Partial implementation of admin functionality and refactoring to services (#132) discard 6237e64 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 discard 71253be WC-950 Implemented Web Console configuration. discard 6fe4fa9 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 discard 92d83be Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 discard 90e37c5 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 discard 1d17b45 IGNITE-5617 Merged with master. discard e8822e5 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 discard c736905 WC-946 Web Console: Implemented inital support for mutual SSL. discard 2bcf3da WC-949 Implement sessions store in Ignite (#125) discard 4f70fdd WC-938 Web Console: Added router to handle Web Agent downloads. discard f789449 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 discard 65390d5 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 discard 2da38b2 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 discard 1d5f2e6 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 discard 12cf676 WC-936 WIP on GG plugin cfg. discard cdbe60c Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 discard 5222663 WC-936 WIP on GG plugin cfg. discard 9fe42cd IGNITE-5617 Refactor embedded web console to separate module. discard 604a459 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 discard 1b89f33 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 discard 03cd552 IGNITE-5617 Move embedded web console to module. discard 749e5db IGNITE-5617 WIP on save basic. discard e68f32a Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 discard 3a2fd1d IGNITE-5617 Work on save basic cluster. discard 298a1af Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 discard 49c3046 IGNITE-5617 Work on routers. discard 4dd9cc8 IGNITE-5617 Work on routers. discard fde0688 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 discard 96abd52 IGNITE-5617 Work on routers. discard 215f5a0 IGNITE-5617 Work on routers. discard 490f15d Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 discard fae7161 IGNITE-5617 Work on routers. discard eafe321 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 discard bae8043 IGNITE-5617 Work on routers. discard 5c8d44d IGNITE-5617 Work on routers. discard 63511fb IGNITE-5617 Work on routers. discard 685701c IGNITE-5617 Work on routers. discard b775bda Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 discard d75d8e0 IGNITE-5617 Work on routers. discard e2fa742 IGNITE-5617 Work on routers. discard 7ea1e68 IGNITE-5617 Work on routers. discard d7b1d99 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 discard 109176b IGNITE-5617 WIP routers. discard d4875ab IGNITE-5617 WIP routers. discard 25b09c3 IGNITE-5617
[ignite] branch ignite-wc-935 created (now a3a5bf5)
This is an automated email from the ASF dual-hosted git repository. akuznetsov pushed a change to branch ignite-wc-935 in repository https://gitbox.apache.org/repos/asf/ignite.git. at a3a5bf5 WC-935 WIP. This branch includes the following new commits: new 01008cc IGNITE-5617 WIP. new e1c7cb0 IGNITE-5617 WIP new 8b803c2 IGNITE-5617 WIP new 6646846 IGNITE-5617 WIP. new 9c04a1c IGNITE-5617 WIP new a47ada3 IGNITE-5617 Merged with master. new 26a93f6 IGNITE-5617 WIP. new 7abbdd9 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 new ef8b6e7 IGNITE-5617 WIP. new 93b1968 IGNITE-5617 WIP. new 1145b17 IGNITE-5617 WIP. new 93bd2e5 IGNITE-5617 WIP. new 7c449fd IGNITE-5617 WIP. new d22ac8b IGNITE-5617 WIP. new f022492 IGNITE-5617 WIP. new 05d0eb1 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 new f404b81 IGNITE-5617 WIP. new b8f29e3 IGNITE-5617 WIP. new 24a4e24 IGNITE-5617 WIP. new 0264332 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 new 77f9a1e IGNITE-5617 WIP new f599f18 IGNITE-5617 WIP. new a46ed9a IGNITE-5617 WIP. new f39d8d1 IGNITE-5617 WIP new 2408eec Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 new 041a742 IGNITE-5617 WIP. new 1f0fad0 IGNITE-5617 WIP. new 824970d Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 new c5b68e2 IGNITE-5617 WIP. new 47ed3ac IGNITE-5617 WIP. new 4873d0e IGNITE-5617 WIP. new a913024 IGNITE-5617 WIP. new f4ba5e2 IGNITE-5617 WIP. new d0f060e Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 new 7f434d9 IGNITE-5617 WIP. new 967e8f5 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 new bde4985 IGNITE-5617 WIP. new b519f57 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 new 7e41c15 IGNITE-5617 WIP. new b99863f IGNITE-5617 WIP. new 918931b IGNITE-5617 WIP. new 131a978 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 new 27d71f5 IGNITE-5617 WIP. new 48a1224 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 new 19b4961 IGNITE-5617 WIP. new 38142ef IGNITE-5617 WIP. new 5c00d6d IGNITE-5617 WIP. new 285c57e IGNITE-5617 WIP. new 4cf34de IGNITE-5617 WIP. new 57b7373 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 new 8e44750 IGNITE-5617 WIP. new 4bd6e0b IGNITE-5617 WIP. new 207710c IGNITE-5617 WIP. new 037a3a8 IGNITE-5617 WIP. new 8718db7 IGNITE-5617 WIP. new 6c25307 IGNITE-5617 WIP. new 31848f4 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 new 4271323 IGNITE-5617 WIP. new 0a26afc Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 new 96641e3 IGNITE-5617 WIP embedded mode. new dd6b5b5 IGNITE-5617 Disable caching for REST. new 41ea5f8 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 new 09bcf9d Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 new e8f6b8c IGNITE-5617 WIP on plugin. new 8eee4e7 IGNITE-5617 Merged with master. new 7af5f23 IGNITE-5617 WIP. new d9b24f6 IGNITE-5617 WIP on refactoring to independent verticles. new c470921 IGNITE-5617 WIP on DI. new c8825c1 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 new 09ec1ba IGNITE-5617 WIP on refactoring to decouple Ignite. new ae05303 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 new 83b0dc8 IGNITE-5617 WIP on refactoring to decouple Ignite. new 5991f20 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 new d74f1c9 IGNITE-5617 Review. new 06988de IGNITE-5617 Merged with master. new f9c5baa IGNITE-5617 WIP. new cac213d IGNITE-5617 ObjectID -> UUID. new 3838e9a IGNITE-5617 WIP on DTO. new 42bed01 IGNITE-5617 Merged with master. new 1179259 IGNITE-5617 WIP on DTO. new 1a9745b Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 new c3a4784 IGNITE-5617 WIP DTO new ec4aa9e IGNITE-5617 Merged with master. new f0e8056 IGNITE-5617 WIP DTO. new 0fa0dee Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-5617 new ea12652 IGNITE-5617 WIP DTO. new bdcd88d IGNITE-5617 Merged with master. new ff37db7 IGN
[ignite] branch master updated: IGNITE-11386 Fixed test.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new c2a5d45 IGNITE-11386 Fixed test.
c2a5d45 is described below
commit c2a5d4581abc60287456b2d43f8b0a995e15288c
Author: Vasiliy Sisko
AuthorDate: Fri Apr 5 22:23:46 2019 +0700
IGNITE-11386 Fixed test.
---
.../console/configuration/WebConsoleConfigurationSelfTest.java | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git
a/modules/web-console/src/test/java/org/apache/ignite/console/configuration/WebConsoleConfigurationSelfTest.java
b/modules/web-console/src/test/java/org/apache/ignite/console/configuration/WebConsoleConfigurationSelfTest.java
index 3365778..2aa45e3 100644
---
a/modules/web-console/src/test/java/org/apache/ignite/console/configuration/WebConsoleConfigurationSelfTest.java
+++
b/modules/web-console/src/test/java/org/apache/ignite/console/configuration/WebConsoleConfigurationSelfTest.java
@@ -207,6 +207,9 @@ public class WebConsoleConfigurationSelfTest {
igniteCfgProps.add("sqlSchemas");
igniteCfgProps.add("igniteInstanceName");
igniteCfgProps.add("communicationFailureResolver");
+igniteCfgProps.add("failureHandler");
+igniteCfgProps.add("rebalanceThreadPoolSize");
+igniteCfgProps.add("localEventListeners");
Set igniteCfgPropsDep = new HashSet<>();
igniteCfgPropsDep.add("gridName");
@@ -222,6 +225,7 @@ public class WebConsoleConfigurationSelfTest {
igniteCfgPropsExcl.add("clientMode");
igniteCfgPropsExcl.add("indexingSpi");
igniteCfgPropsExcl.add("nodeId");
+igniteCfgPropsExcl.add("platformConfiguration");
igniteCfgPropsExcl.add("segmentCheckFrequency");
igniteCfgPropsExcl.add("allSegmentationResolversPassRequired");
igniteCfgPropsExcl.add("segmentationPolicy");
@@ -380,7 +384,6 @@ public class WebConsoleConfigurationSelfTest {
commProps.add("connectionsPerNode");
commProps.add("usePairedConnections");
commProps.add("filterReachableAddresses");
-commProps.add("soLinger");
metadata.put(TcpCommunicationSpi.class, new MetadataInfo(commProps,
EMPTY_FIELDS, SPI_EXCLUDED_FIELDS));
@@ -412,6 +415,7 @@ public class WebConsoleConfigurationSelfTest {
discoverySpiProps.add("clientReconnectDisabled");
discoverySpiProps.add("connectionRecoveryTimeout");
discoverySpiProps.add("reconnectDelay");
+discoverySpiProps.add("soLinger");
Set discoverySpiExclProps = new HashSet<>();
discoverySpiExclProps.addAll(SPI_EXCLUDED_FIELDS);
@@ -695,6 +699,9 @@ public class WebConsoleConfigurationSelfTest {
transactionCfgProps.add("pessimisticTxLogLinger");
transactionCfgProps.add("pessimisticTxLogSize");
transactionCfgProps.add("txManagerFactory");
+transactionCfgProps.add("deadlockTimeout");
+transactionCfgProps.add("useJtaSynchronization");
+transactionCfgProps.add("txTimeoutOnPartitionMapExchange");
Set transactionCfgPropsDep = new HashSet<>();
transactionCfgPropsDep.add("txSerializableEnabled");
[ignite] branch master updated: IGNITE-11386 Web console: Actualized cluster configuration.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new b1729a2 IGNITE-11386 Web console: Actualized cluster configuration.
b1729a2 is described below
commit b1729a271f94b51a57d1c464cb70268a8fc2f8b2
Author: Vasiliy Sisko
AuthorDate: Fri Apr 5 22:12:04 2019 +0700
IGNITE-11386 Web console: Actualized cluster configuration.
---
modules/web-console/backend/app/schemas.js | 4 +++
.../components/cluster-edit-form/controller.ts | 13
.../cluster-edit-form/templates/events.pug | 38 ++
.../app/configuration/generator/generator/Beans.js | 5 ++-
.../generator/generator/ConfigurationGenerator.js | 7
.../generator/generator/JavaTransformer.service.js | 27 +--
.../generator/SpringTransformer.service.js | 19 ---
.../generator/defaults/Cluster.service.js | 9 +
.../app/configuration/services/Clusters.ts | 11 +++
9 files changed, 125 insertions(+), 8 deletions(-)
diff --git a/modules/web-console/backend/app/schemas.js
b/modules/web-console/backend/app/schemas.js
index 65d4b93..a2fad1c 100644
--- a/modules/web-console/backend/app/schemas.js
+++ b/modules/web-console/backend/app/schemas.js
@@ -1237,6 +1237,10 @@ module.exports.factory = function(mongoose) {
className: String
}
},
+localEventListeners: [{
+className: String,
+eventTypes: [String]
+}],
mvccVacuumThreadCount: Number,
mvccVacuumFrequency: Number,
authenticationEnabled: Boolean,
diff --git
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/controller.ts
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/controller.ts
index 3a2c8bf..1de84ab 100644
---
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/controller.ts
+++
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/controller.ts
@@ -82,12 +82,25 @@ export default class ClusterEditFormController {
this.eventStorage.push({value: null, label: 'Disabled'});
this.eventGroups = _.filter(this.IgniteEventGroups, ({value})
=> value !== 'EVTS_SWAPSPACE');
+
+_.forEach(this.eventGroups, (grp) => grp.events =
_.filter(grp.events, (evt) => evt.indexOf('SWAP') < 0));
}
else {
this.eventGroups = this.IgniteEventGroups;
this.marshallerVariant.splice(0, 0, {value:
'OptimizedMarshaller', label: 'OptimizedMarshaller'});
}
+
+this.eventTypes = [];
+
+_.forEach(this.eventGroups, (grp) => {
+_.forEach(grp.events, (e) => {
+const newVal = {value: e, label: e};
+
+if (!_.find(this.eventTypes, newVal))
+this.eventTypes.push(newVal);
+});
+});
};
rebuildDropdowns();
diff --git
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/events.pug
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/events.pug
index e422462..12219fe 100644
---
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/events.pug
+++
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/events.pug
@@ -109,5 +109,43 @@ panel-collapsible(ng-form=form
on-open=`ui.loadPanel('${form}')`)
tip: 'Array of event types, which will be recorded by
GridEventStorageManager#record(Event)\
Note, that either the include event types or the
exclude event types can be established'
})
+.pc-form-grid-col-60
+.ignite-form-field
++form-field__label({label: 'Local event listeners:', name:
'"LocalEventListeners"'})
++form-field__tooltip({title: `Local event listeners`})
+
+-var items = model + '.localEventListeners'
+
list-editable.pc-list-editable-with-form-grid(ng-model=items
name='LocalEventListeners')
+list-editable-item-edit.pc-form-grid-row
+- form = '$parent.form'
+.pc-form-grid-col-40
++form-field__java-class({
+
[ignite] branch master updated: IGNITE-11385 Web console: Actualized cluster configuration.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 5642ce6 IGNITE-11385 Web console: Actualized cluster configuration.
5642ce6 is described below
commit 5642ce6363b18f8468881c52b221d7f3db4a0536
Author: Vasiliy Sisko
AuthorDate: Fri Apr 5 21:15:13 2019 +0700
IGNITE-11385 Web console: Actualized cluster configuration.
---
modules/web-console/backend/app/schemas.js | 12 +
.../components/cluster-edit-form/controller.ts | 32 ---
.../cluster-edit-form/templates/failover.pug | 62 ++
.../app/configuration/generator/generator/Beans.js | 4 ++
.../generator/generator/ConfigurationGenerator.js | 59
.../generator/generator/JavaTransformer.service.js | 7 ++-
.../generator/defaults/Cluster.service.js | 3 ++
7 files changed, 172 insertions(+), 7 deletions(-)
diff --git a/modules/web-console/backend/app/schemas.js
b/modules/web-console/backend/app/schemas.js
index dafdc60..65d4b93 100644
--- a/modules/web-console/backend/app/schemas.js
+++ b/modules/web-console/backend/app/schemas.js
@@ -1225,6 +1225,18 @@ module.exports.factory = function(mongoose) {
className: String
}
},
+failureHandler: {
+kind: {type: String, enum: ['RestartProcess', 'StopNodeOnHalt',
'StopNode', 'Noop', 'Custom']},
+ignoredFailureTypes: [{type: String, enum: ['SEGMENTATION',
'SYSTEM_WORKER_TERMINATION',
+'SYSTEM_WORKER_BLOCKED', 'CRITICAL_ERROR',
'SYSTEM_CRITICAL_OPERATION_TIMEOUT']}],
+StopNodeOnHalt: {
+tryStop: Boolean,
+timeout: Number
+},
+Custom: {
+className: String
+}
+},
mvccVacuumThreadCount: Number,
mvccVacuumFrequency: Number,
authenticationEnabled: Boolean,
diff --git
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/controller.ts
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/controller.ts
index f1afd3c..3a2c8bf 100644
---
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/controller.ts
+++
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/controller.ts
@@ -47,10 +47,6 @@ export default class ClusterEditFormController {
private IgniteFormUtils: ReturnType
) {}
-$onDestroy() {
-this.subscription.unsubscribe();
-}
-
$onInit() {
this.available = this.IgniteVersion.available.bind(this.IgniteVersion);
@@ -65,6 +61,23 @@ export default class ClusterEditFormController {
{value: null, label: 'Default'}
];
+this.failureHandlerVariant = [
+{value: 'RestartProcess', label: 'Restart process'},
+{value: 'StopNodeOnHalt', label: 'Try stop with timeout'},
+{value: 'StopNode', label: 'Stop on critical error'},
+{value: 'Noop', label: 'Disabled'},
+{value: 'Custom', label: 'Custom'},
+{value: null, label: 'Default'}
+];
+
+this.ignoredFailureTypes = [
+{value: 'SEGMENTATION', label: 'SEGMENTATION'},
+{value: 'SYSTEM_WORKER_TERMINATION', label:
'SYSTEM_WORKER_TERMINATION'},
+{value: 'SYSTEM_WORKER_BLOCKED', label:
'SYSTEM_WORKER_BLOCKED'},
+{value: 'CRITICAL_ERROR', label: 'CRITICAL_ERROR'},
+{value: 'SYSTEM_CRITICAL_OPERATION_TIMEOUT', label:
'SYSTEM_CRITICAL_OPERATION_TIMEOUT'}
+];
+
if (this.available('2.0.0')) {
this.eventStorage.push({value: null, label: 'Disabled'});
@@ -111,6 +124,10 @@ export default class ClusterEditFormController {
];
}
+$onDestroy() {
+this.subscription.unsubscribe();
+}
+
$onChanges(changes) {
if ('cluster' in changes && this.shouldOverwriteValue(this.cluster,
this.clonedCluster)) {
this.clonedCluster = cloneDeep(changes.cluster.currentValue);
@@ -146,12 +163,15 @@ export default class ClusterEditFormController {
save(download) {
if (this.$scope.ui.inputForm.$invalid)
return
this.IgniteFormUtils.triggerValidation(this.$scope.ui.inputForm, this.$scope);
+
this.onSave({$event: {cluster: cloneDeep(this.clonedCluster),
download}});
}
reset = () => this.clonedCluster = cloneDeep(this.cluster);
+
confirmAndReset() {
-return this.IgniteConfirm.confirm('Are you sure you want to undo a
[ignite] branch master updated: IGNITE-11387 Web console: Actualized cluster configuration.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new cf6ce6c IGNITE-11387 Web console: Actualized cluster configuration.
cf6ce6c is described below
commit cf6ce6cfd97619e74b3e89cab3fb157d43db8c07
Author: Vasiliy Sisko
AuthorDate: Fri Apr 5 21:04:08 2019 +0700
IGNITE-11387 Web console: Actualized cluster configuration.
---
modules/web-console/backend/app/schemas.js | 11 +++
.../components/cluster-edit-form/template.tpl.pug | 4 ++
.../cluster-edit-form/templates/encryption.pug | 81 ++
.../cluster-edit-form/templates/mvcc.pug | 4 +-
.../generator/generator/AbstractTransformer.js | 5 ++
.../generator/generator/ConfigurationGenerator.js | 41 +++
.../generator/defaults/Cluster.service.js | 6 ++
.../WebConsoleConfigurationSelfTest.java | 8 +++
8 files changed, 158 insertions(+), 2 deletions(-)
diff --git a/modules/web-console/backend/app/schemas.js
b/modules/web-console/backend/app/schemas.js
index 3e62a3d..dafdc60 100644
--- a/modules/web-console/backend/app/schemas.js
+++ b/modules/web-console/backend/app/schemas.js
@@ -1214,6 +1214,17 @@ module.exports.factory = function(mongoose) {
subIntervals: Number,
walAutoArchiveAfterInactivity: Number
},
+encryptionSpi: {
+kind: {type: String, enum: ['Noop', 'Keystore', 'Custom']},
+Keystore: {
+keySize: Number,
+masterKeyName: String,
+keyStorePath: String
+},
+Custom: {
+className: String
+}
+},
mvccVacuumThreadCount: Number,
mvccVacuumFrequency: Number,
authenticationEnabled: Boolean,
diff --git
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/template.tpl.pug
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/template.tpl.pug
index e30cfdb..008fd97 100644
---
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/template.tpl.pug
+++
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/template.tpl.pug
@@ -37,6 +37,10 @@ form(id='cluster' name='ui.inputForm' novalidate)
include ./templates/data-storage
include ./templates/discovery
+
+//- Since ignite 2.7
+include ./templates/encryption
+
include ./templates/events
include ./templates/failover
include ./templates/hadoop
diff --git
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/encryption.pug
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/encryption.pug
new file mode 100644
index 000..102453c
--- /dev/null
+++
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/encryption.pug
@@ -0,0 +1,81 @@
+//-
+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.
+
+include /app/helpers/jade/mixins
+include /app/configuration/mixins
+
+-var form = 'encryption'
+-var model = '$ctrl.clonedCluster.encryptionSpi'
+
+panel-collapsible(ng-show='$ctrl.available("2.7.0")' ng-form=form
on-open=`ui.loadPanel('${form}')`)
+panel-title Encryption
+panel-description Encryption features for an Ignite
+panel-content.pca-form-row(ng-if=`ui.isPanelLoaded('${form}')`)
+.pca-form-column-6.pc-form-grid-row
+.pc-form-grid-col-60
++form-field__dropdown({
+label: 'Encryption SPI:',
+model: `${model}.kind`,
+name: '"encryptionSpi"',
+placeholder: 'Disabled',
+options: '[\
+
[ignite] branch master updated: IGNITE-11361 Web console: Actualized cluster configuration.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 83c3703 IGNITE-11361 Web console: Actualized cluster configuration.
83c3703 is described below
commit 83c3703e00847eb2f52c05fe575c591af9bdbf0e
Author: Vasiliy Sisko
AuthorDate: Fri Apr 5 20:31:15 2019 +0700
IGNITE-11361 Web console: Actualized cluster configuration.
---
modules/web-console/backend/app/schemas.js | 14 +-
.../cluster-edit-form/templates/communication.pug | 17 +++
.../cluster-edit-form/templates/data-storage.pug | 13 +-
.../cluster-edit-form/templates/misc.pug | 167 ++---
.../generator/generator/AbstractTransformer.js | 4 +-
.../generator/generator/ConfigurationGenerator.js | 51 ++-
.../generator/defaults/Cluster.service.js | 7 +-
.../app/configuration/services/Clusters.ts | 10 +-
.../WebConsoleConfigurationSelfTest.java | 21 +++
9 files changed, 270 insertions(+), 34 deletions(-)
diff --git a/modules/web-console/backend/app/schemas.js
b/modules/web-console/backend/app/schemas.js
index 50b97f3..3e62a3d 100644
--- a/modules/web-console/backend/app/schemas.js
+++ b/modules/web-console/backend/app/schemas.js
@@ -1085,6 +1085,7 @@ module.exports.factory = function(mongoose) {
clientFailureDetectionTimeout: Number,
systemWorkerBlockedTimeout: Number,
workDirectory: String,
+igniteHome: String,
lateAffinityAssignment: Boolean,
utilityCacheKeepAliveTime: Number,
asyncCallbackPoolSize: Number,
@@ -1214,7 +1215,18 @@ module.exports.factory = function(mongoose) {
walAutoArchiveAfterInactivity: Number
},
mvccVacuumThreadCount: Number,
-mvccVacuumFrequency: Number
+mvccVacuumFrequency: Number,
+authenticationEnabled: Boolean,
+sqlQueryHistorySize: Number,
+lifecycleBeans: [String],
+addressResolver: String,
+mBeanServer: String,
+networkCompressionLevel: Number,
+includeProperties: [String],
+cacheStoreSessionListenerFactories: [String],
+autoActivationEnabled: {type: Boolean, default: true},
+sqlSchemas: [String],
+communicationFailureResolver: String
});
Cluster.index({name: 1, space: 1}, {unique: true});
diff --git
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/communication.pug
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/communication.pug
index 0f7ce23..41ef206 100644
---
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/communication.pug
+++
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/communication.pug
@@ -56,6 +56,16 @@ panel-collapsible(ng-form=form
on-open=`ui.loadPanel('${form}')`)
min: '1',
tip: 'Message send retries count'
})
+.pc-form-grid-col-30(ng-if='$ctrl.available("2.8.0")')
++form-field__number({
+label: 'Compression level:',
+model: `${model}.networkCompressionLevel`,
+name: '"networkCompressionLevel"',
+placeholder: '1',
+min: '0',
+max: '9',
+tip: 'Compression level of internal network messages'
+})
.pc-form-grid-col-30(ng-if='$ctrl.available(["1.0.0", "2.3.0"])')
+form-field__number({
label: 'Discovery startup delay:',
@@ -65,6 +75,13 @@ panel-collapsible(ng-form=form
on-open=`ui.loadPanel('${form}')`)
min: '1',
tip: 'This value is used to expire messages from waiting
list whenever node discovery discrepancies happen'
})
+.pc-form-grid-col-60(ng-if='$ctrl.available("2.5.0")')
++form-field__java-class({
+label: 'Failure resolver:',
+model: `${model}.communicationFailureResolver`,
+name: '"communicationFailureResolver"',
+tip: 'Communication failure resovler'
+})
.pc-form-grid-col-60
+form-field__java-class({
label: 'Communication listener:',
diff --git
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/data-storage.pug
b/modules/web-console/frontend/app/configuratio
[ignite] branch master updated: IGNITE-11354 Web console: Actualized cluster configuration.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new f3e481f IGNITE-11354 Web console: Actualized cluster configuration.
f3e481f is described below
commit f3e481f9dcc6d533fa83d08aef84d6211051792f
Author: Vasiliy Sisko
AuthorDate: Fri Apr 5 18:45:15 2019 +0700
IGNITE-11354 Web console: Actualized cluster configuration.
---
modules/web-console/backend/app/schemas.js | 16 --
.../cluster-edit-form/templates/atomic.pug | 36 --
.../cluster-edit-form/templates/communication.pug | 32
.../cluster-edit-form/templates/data-storage.pug | 58 +++---
.../cluster-edit-form/templates/discovery.pug | 27 ++
.../generator/generator/ConfigurationGenerator.js | 50 +++
.../generator/defaults/Cluster.service.js | 14 --
.../WebConsoleConfigurationSelfTest.java | 28 +++
8 files changed, 200 insertions(+), 61 deletions(-)
diff --git a/modules/web-console/backend/app/schemas.js
b/modules/web-console/backend/app/schemas.js
index 29493a5..50b97f3 100644
--- a/modules/web-console/backend/app/schemas.js
+++ b/modules/web-console/backend/app/schemas.js
@@ -494,6 +494,9 @@ module.exports.factory = function(mongoose) {
authenticator: String,
forceServerMode: Boolean,
clientReconnectDisabled: Boolean,
+connectionRecoveryTimeout: Number,
+reconnectDelay: Number,
+soLinger: Number,
kind: {
type: String,
enum: ['Vm', 'Multicast', 'S3', 'Cloud', 'GoogleStorage',
'Jdbc', 'SharedFs', 'ZooKeeper', 'Kubernetes']
@@ -655,7 +658,8 @@ module.exports.factory = function(mongoose) {
Custom: {
className: String
}
-}
+},
+groupName: String
},
binaryConfiguration: {
idMapper: String,
@@ -730,7 +734,11 @@ module.exports.factory = function(mongoose) {
unacknowledgedMessagesBufferSize: Number,
socketWriteTimeout: Number,
selectorsCount: Number,
-addressResolver: String
+addressResolver: String,
+selectorSpins: Number,
+connectionsPerNode: Number,
+usePairedConnections: Boolean,
+filterReachableAddresses: Boolean
},
connector: {
enabled: Boolean,
@@ -1146,7 +1154,9 @@ module.exports.factory = function(mongoose) {
walAutoArchiveAfterInactivity: Number,
writeThrottlingEnabled: Boolean,
walCompactionEnabled: Boolean,
-checkpointReadLockTimeout: Number
+checkpointReadLockTimeout: Number,
+maxWalArchiveSize: Number,
+walCompactionLevel: Number
},
memoryConfiguration: {
systemCacheInitialSize: Number,
diff --git
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/atomic.pug
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/atomic.pug
index d227c27..b27ada9 100644
---
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/atomic.pug
+++
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/atomic.pug
@@ -38,16 +38,16 @@ panel-collapsible(ng-form=form
on-open=`ui.loadPanel('${form}')`)
name: '"cacheMode"',
placeholder: 'PARTITIONED',
options: '[\
-{value: "LOCAL", label: "LOCAL"},\
-{value: "REPLICATED", label:
"REPLICATED"},\
-{value: "PARTITIONED", label:
"PARTITIONED"}\
-]',
+{value: "LOCAL", label: "LOCAL"},\
+{value: "REPLICATED", label: "REPLICATED"},\
+{value: "PARTITIONED", label: "PARTITIONED"}\
+]',
tip: 'Cache modes:\
-\
-Partitioned - in this mode the
overall key set will be divided into partitions and all partitions will be
split equally between participating nodes\
-Replicated - in this mode all
the keys are distributed to all participati
[ignite] branch master updated: IGNITE-11284 Web console: Actualized cluster configuration.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new b6a07f6 IGNITE-11284 Web console: Actualized cluster configuration.
b6a07f6 is described below
commit b6a07f65bba402e5bfa165957f526cee95098f44
Author: Vasiliy Sisko
AuthorDate: Fri Apr 5 18:13:08 2019 +0700
IGNITE-11284 Web console: Actualized cluster configuration.
---
modules/web-console/backend/app/schemas.js | 14 +++-
.../components/model-edit-form/templates/query.pug | 72 -
.../generator/generator/ConfigurationGenerator.js | 74 --
.../generator/generator/JavaTransformer.service.js | 4 +-
.../generator/SpringTransformer.service.js | 6 +-
.../generator/generator/defaults/Cache.service.js | 12
.../frontend/app/configuration/services/Models.ts | 41
.../WebConsoleConfigurationSelfTest.java | 6 ++
8 files changed, 216 insertions(+), 13 deletions(-)
diff --git a/modules/web-console/backend/app/schemas.js
b/modules/web-console/backend/app/schemas.js
index 4741776..29493a5 100644
--- a/modules/web-console/backend/app/schemas.js
+++ b/modules/web-console/backend/app/schemas.js
@@ -122,12 +122,21 @@ module.exports.factory = function(mongoose) {
javaFieldType: String
}],
queryKeyFields: [String],
-fields: [{name: String, className: String}],
+fields: [{
+name: String,
+className: String,
+notNull: Boolean,
+defaultValue: String,
+precision: Number,
+scale: Number
+}],
aliases: [{field: String, alias: String}],
indexes: [{
name: String,
indexType: {type: String, enum: ['SORTED', 'FULLTEXT',
'GEOSPATIAL']},
-fields: [{name: String, direction: Boolean}]
+fields: [{name: String, direction: Boolean}],
+inlineSizeType: Number,
+inlineSize: Number
}],
generatePojo: Boolean
});
@@ -182,6 +191,7 @@ module.exports.factory = function(mongoose) {
backups: Number,
memoryMode: {type: String, enum: ['ONHEAP_TIERED', 'OFFHEAP_TIERED',
'OFFHEAP_VALUES']},
+offHeapMode: Number,
offHeapMaxMemory: Number,
startSize: Number,
swapEnabled: Boolean,
diff --git
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/templates/query.pug
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/templates/query.pug
index 2dbb565..9f14980 100644
---
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/templates/query.pug
+++
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/templates/query.pug
@@ -77,12 +77,12 @@ panel-collapsible(ng-form=form
opened=`!!${model}.queryMetadata`)
ng-change=`$ctrl.onQueryFieldsChange(${model})`
)
list-editable-item-view
-| {{ $item.name}} / {{ $item.className}}
+|
{{$ctrl.Models.fieldProperties.fieldPresentation($item, $ctrl.available)}}
list-editable-item-edit
- form = '$parent.form'
.pc-form-grid-row
-.pc-form-grid-col-30(divider='/')
+.pc-form-grid-col-30
+form-field__text({
label: 'Field name:',
model: '$item.name',
@@ -98,7 +98,7 @@ panel-collapsible(ng-form=form
opened=`!!${model}.queryMetadata`)
.pc-form-grid-col-30
+form-field__java-class--typeahead({
label: 'Field full class name:',
-model: `$item.className`,
+model: '$item.className',
name: '"className"',
options: '$ctrl.queryFieldTypes',
required: 'true',
@@ -107,6 +107,41 @@ panel-collapsible(ng-form=form
opened=`!!${model}.queryMetadata`)
ng-model-options='{allowInvalid:
true}'
extra-valid-java-identifiers='$ctrl.query
[ignite] branch master updated: IGNITE-11283 Web console: Actualized cluster configuration.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 9c721f7 IGNITE-11283 Web console: Actualized cluster configuration.
9c721f7 is described below
commit 9c721f7f053f80558444fb38fe638c50018dabe3
Author: Vasiliy Sisko
AuthorDate: Fri Apr 5 17:17:34 2019 +0700
IGNITE-11283 Web console: Actualized cluster configuration.
---
modules/web-console/backend/app/schemas.js | 8 +++-
.../cluster-edit-form/templates/persistence.pug| 31
.../cluster-edit-form/templates/transactions.pug | 25 ++
.../generator/generator/AbstractTransformer.js | 4 +-
.../generator/generator/ConfigurationGenerator.js | 17 +--
.../generator/generator/defaults/Cache.service.js | 1 -
.../generator/defaults/Cluster.service.js | 12 -
.../WebConsoleConfigurationSelfTest.java | 55 --
.../ignite/console/configuration/WrongFields.java | 2 +-
9 files changed, 129 insertions(+), 26 deletions(-)
diff --git a/modules/web-console/backend/app/schemas.js
b/modules/web-console/backend/app/schemas.js
index ce48932..4741776 100644
--- a/modules/web-console/backend/app/schemas.js
+++ b/modules/web-console/backend/app/schemas.js
@@ -769,7 +769,10 @@ module.exports.factory = function(mongoose) {
pessimisticTxLogLinger: Number,
pessimisticTxLogSize: Number,
txSerializableEnabled: Boolean,
-txManagerFactory: String
+txManagerFactory: String,
+useJtaSynchronization: Boolean,
+txTimeoutOnPartitionMapExchange: Number, // 2.5
+deadlockTimeout: Number // 2.8
},
sslEnabled: Boolean,
sslContextFactory: {
@@ -1187,7 +1190,8 @@ module.exports.factory = function(mongoose) {
lockWaitTime: Number,
rateTimeInterval: Number,
tlbSize: Number,
-subIntervals: Number
+subIntervals: Number,
+walAutoArchiveAfterInactivity: Number
},
mvccVacuumThreadCount: Number,
mvccVacuumFrequency: Number
diff --git
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/persistence.pug
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/persistence.pug
index a8ddd97..e0f5955 100644
---
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/persistence.pug
+++
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/persistence.pug
@@ -95,6 +95,27 @@ panel-collapsible(
tip: 'A number of threads to use for the checkpointing
purposes'
})
.pc-form-grid-col-60
++form-field__dropdown({
+label: 'WAL mode:',
+model: `${model}.walMode`,
+name: '"PersistenceWalMode"',
+disabled: `!(${enabled})`,
+placeholder: 'DEFAULT',
+options: '[\
+{value: "DEFAULT", label: "DEFAULT"},\
+{value: "LOG_ONLY", label: "LOG_ONLY"},\
+{value: "BACKGROUND", label: "BACKGROUND"},\
+{value: "NONE", label: "NONE"}\
+]',
+tip: 'Type define behavior wal fsync.\
+\
+DEFAULT - full-sync disk writes\
+LOG_ONLY - flushes application buffers\
+BACKGROUND - does not force applications
buffer flush\
+NONE - WAL is disabled\
+'
+})
+.pc-form-grid-col-60
+form-field__text({
label: 'WAL store path:',
model: `${model}.walStorePath`,
@@ -212,5 +233,15 @@ panel-collapsible(
min: '1',
tip: 'Number of sub - intervals the whole rate time
interval will be split into to calculate rate - based metrics'
})
+.pc-form-grid-col-60
++form-field__number({
+label: 'WAL auto archive after inactivity:',
+model: `${model}.walAutoArchiveAfterInactivity`,
+name: '"PersistenceWalAutoArchiveAfterInactivity"',
+disabled: `!(${enabled})`,
+placeholder: '-1',
+min: '-1'
[ignite] branch master updated: IGNITE-11182 Web console: Actualized cluster configuration.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 0af4fdf IGNITE-11182 Web console: Actualized cluster configuration.
0af4fdf is described below
commit 0af4fdf839fb1fb58e34a81bba473ec86792062b
Author: Vasiliy Sisko
AuthorDate: Fri Apr 5 13:15:57 2019 +0700
IGNITE-11182 Web console: Actualized cluster configuration.
---
.../eviction/lru/LruEvictionPolicyFactory.java | 1 -
modules/web-console/backend/app/schemas.js | 71 +-
.../components/cache-edit-form/template.tpl.pug| 2 +
.../cache-edit-form/templates/general.pug | 42 ++--
.../cache-edit-form/templates/key-cfg.pug | 66 ++
.../cache-edit-form/templates/memory.pug | 21 ++
.../components/cache-edit-form/templates/misc.pug | 95
.../components/cache-edit-form/templates/query.pug | 45 +++-
.../components/cache-edit-form/templates/store.pug | 9 +
.../components/cluster-edit-form/templates/ssl.pug | 28 +++
.../igfs-edit-form/templates/secondary.pug | 252 -
.../generator/generator/AbstractTransformer.js | 14 +-
.../app/configuration/generator/generator/Beans.js | 7 +
.../generator/generator/ConfigurationGenerator.js | 163 -
.../generator/generator/JavaTransformer.service.js | 8 +
.../generator/generator/Maven.service.js | 2 +-
.../generator/SpringTransformer.service.js | 2 +
.../generator/generator/defaults/Cache.service.js | 9 +-
.../generator/generator/defaults/IGFS.service.js | 15 +-
.../frontend/app/configuration/services/Caches.ts | 3 +-
.../frontend/app/configuration/services/IGFSs.ts | 16 +-
.../WebConsoleConfigurationSelfTest.java | 69 +-
22 files changed, 878 insertions(+), 62 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/LruEvictionPolicyFactory.java
b/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/LruEvictionPolicyFactory.java
index 8f7fbc5..ff873ac 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/LruEvictionPolicyFactory.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/LruEvictionPolicyFactory.java
@@ -68,5 +68,4 @@ public class LruEvictionPolicyFactory extends
AbstractEvictionPolicyFactor
return policy;
}
-
}
diff --git a/modules/web-console/backend/app/schemas.js
b/modules/web-console/backend/app/schemas.js
index 29ec9b4..ce48932 100644
--- a/modules/web-console/backend/app/schemas.js
+++ b/modules/web-console/backend/app/schemas.js
@@ -185,6 +185,21 @@ module.exports.factory = function(mongoose) {
offHeapMaxMemory: Number,
startSize: Number,
swapEnabled: Boolean,
+cacheWriterFactory: String,
+cacheLoaderFactory: String,
+expiryPolicyFactory: String,
+interceptor: String,
+storeByValue: Boolean,
+eagerTtl: {type: Boolean, default: true},
+encryptionEnabled: Boolean,
+eventsDisabled: Boolean,
+
+keyConfiguration: [{
+typeName: String,
+affinityKeyFieldName: String
+}],
+
+cacheStoreSessionListenerFactories: [String],
onheapCacheEnabled: Boolean,
@@ -255,6 +270,8 @@ module.exports.factory = function(mongoose) {
hibernateProperties: [{name: String, value: String}]
}
},
+storeConcurrentLoadAllThreshold: Number,
+maxQueryIteratorsCount: Number,
storeKeepBinary: Boolean,
loadPreviousValue: Boolean,
readThrough: Boolean,
@@ -377,9 +394,57 @@ module.exports.factory = function(mongoose) {
trashPurgeTimeout: Number,
secondaryFileSystemEnabled: Boolean,
secondaryFileSystem: {
+userName: String,
+kind: {type: String, enum: ['Caching', 'Kerberos', 'Custom'],
default: 'Caching'},
uri: String,
cfgPath: String,
-userName: String
+cfgPaths: [String],
+userNameMapper: {
+kind: {type: String, enum: ['Chained', 'Basic', 'Kerberos',
'Custom']},
+Chained: {
+mappers: [{
+kind: {type: String, enum: ['Basic', 'Kerberos',
'Custom']},
+Basic: {
+defaultUserName: String,
+useDefaultUserName: Boolean,
+mappings: [{
+name: String,
+value: String
+}]
+},
+Kerberos: {
+instance: String,
+realm: String
[ignite] branch master updated: IGNITE-8368 Web Console: Refactored queries notebooks list.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 0d93a0b IGNITE-8368 Web Console: Refactored queries notebooks list.
0d93a0b is described below
commit 0d93a0b84a135e1853cb7972fafbcca65d12fe82
Author: Alexander Kalinin
AuthorDate: Fri Apr 5 12:40:23 2019 +0700
IGNITE-8368 Web Console: Refactored queries notebooks list.
---
.../queries-notebooks-list/controller.js | 43 --
.../queries-notebooks-list/template.tpl.pug| 9 -
2 files changed, 16 insertions(+), 36 deletions(-)
diff --git
a/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js
b/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js
index 379f974..a10dd1f 100644
---
a/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js
+++
b/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js
@@ -15,8 +15,6 @@
* limitations under the License.
*/
-import headerTemplate from
'../../../../../app/primitives/ui-grid-header/index.tpl.pug';
-
export class NotebooksListCtrl {
static $inject = ['IgniteNotebook', 'IgniteMessages', 'IgniteLoading',
'IgniteInput', '$scope', '$modal'];
@@ -31,45 +29,18 @@ export class NotebooksListCtrl {
const sqlQueryTemplate = `{{row.entity.sqlQueriesParagraphsLength}}`;
const scanQueryTemplate = `{{row.entity.scanQueriesPsaragraphsLength}}`;
-const categories = [
+this.categories = [
{ name: 'Name', visible: true, enableHiding: false },
{ name: 'SQL Queries', visible: true, enableHiding: false },
{ name: 'Scan Queries', visible: true, enableHiding: false }
];
-const columnDefs = [
-{ name: 'name', displayName: 'Notebook name', categoryDisplayName:
'Name', field: 'name', cellTemplate: notebookNameTemplate, pinnedLeft: true,
filter: { placeholder: 'Filter by Name...' } },
+this.columnDefs = [
+{ name: 'name', displayName: 'Notebook name', categoryDisplayName:
'Name', field: 'name', cellTemplate: notebookNameTemplate, filter: {
placeholder: 'Filter by Name...' } },
{ name: 'sqlQueryNum', displayName: 'SQL Queries',
categoryDisplayName: 'SQL Queries', field: 'sqlQueriesParagraphsLength',
cellTemplate: sqlQueryTemplate, enableSorting: true, type: 'number', minWidth:
150, width: '10%', enableFiltering: false },
{ name: 'scanQueryNum', displayName: 'Scan Queries',
categoryDisplayName: 'Scan Queries', field: 'scanQueriesParagraphsLength',
cellTemplate: scanQueryTemplate, enableSorting: true, type: 'number', minWidth:
150, width: '10%', enableFiltering: false }
];
-this.gridOptions = {
-data: [],
-
-categories,
-columnDefs,
-headerTemplate,
-
-rowHeight: 46,
-selectWithCheckboxOnly: true,
-suppressRemoveSort: false,
-enableFiltering: true,
-enableSelectAll: true,
-enableRowSelection: true,
-enableFullRowSelection: true,
-enableColumnMenus: false,
-noUnselect: false,
-fastWatch: true,
-onRegisterApi: (api) => {
-this.gridApi = api;
-
-api.selection.on.rowSelectionChanged($scope,
this._onSelectionChanged.bind(this));
-api.selection.on.rowSelectionChangedBatch($scope,
this._onSelectionChanged.bind(this));
-
-this.$scope.$watch(() =>
this.gridApi.grid.getVisibleRows().length, (rows) => this._adjustHeight(rows));
-}
-};
-
this.actionOptions = [
{
action: 'Clone',
@@ -96,8 +67,10 @@ export class NotebooksListCtrl {
async _loadAllNotebooks() {
try {
this.IgniteLoading.start('notebooksLoading');
-this.notebooks = await this.IgniteNotebook.read();
-this.gridOptions.data =
this._preprocessNotebooksList(this.notebooks);
+
+const data = await this.IgniteNotebook.read();
+
+this.notebooks = this._preprocessNotebooksList(data);
}
catch (err) {
this.IgniteMessages.showError(err);
@@ -122,7 +95,7 @@ export class NotebooksListCtrl {
return notebook.paragraphs.filter((paragraph) => paragraph.qryType ===
queryType).length || 0;
}
-_onSelectionChanged() {
+onSelectionChanged() {
this._checkActionsAllow();
}
diff --git
a/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/template.tpl.pug
b/modules/web-console/
[ignite] branch master updated: IGNITE-9801 Web Console: Export button restyled.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 44b0522 IGNITE-9801 Web Console: Export button restyled.
44b0522 is described below
commit 44b0522f98c3daff27d2ea1cdd236ef3ce307a48
Author: Alexander Kalinin
AuthorDate: Fri Apr 5 12:01:40 2019 +0700
IGNITE-9801 Web Console: Export button restyled.
---
.../components/queries-notebook/template.tpl.pug | 18 ++
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git
a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug
b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug
index dead633..60a2ddf 100644
---
a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug
+++
b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug
@@ -199,35 +199,29 @@ mixin table-result-heading-query
+result-toolbar
.col-xs-3
.pull-right
-.btn-group.panel-tip-container
-button.btn.btn-primary.btn--with-icon(
+.btn-ignite-group
+button.btn-ignite.btn-ignite--primary(
ng-click='exportCsv(paragraph)'
-
ng-disabled='paragraph.loading'
-
bs-tooltip=''
ng-attr-title='{{ queryTooltip(paragraph, "export
query results") }}'
-
data-trigger='hover'
data-placement='bottom'
)
svg(ignite-icon='csv'
ng-if='!paragraph.csvIsPreparing')
-
i.fa.fa-fw.fa-refresh.fa-spin(ng-if='paragraph.csvIsPreparing')
-span Export
+svg.fa-spin(ignite-icon='refresh'
ng-if='paragraph.csvIsPreparing')
+| Export
-var options = [{ text: 'Export', click:
'exportCsv(paragraph)' }, { text: 'Export all', click:
'exportCsvAll(paragraph)' }, { divider: true }, { text: 'Copy to clipboard', click:
'exportCsvToClipBoard(paragraph)' }]
-button.btn.dropdown-toggle.btn-primary(
+button.btn-ignite.btn-ignite--primary(
ng-disabled='paragraph.loading'
-
bs-dropdown=`${JSON.stringify(options)}`
-
data-toggle='dropdown'
data-container='body'
data-placement='bottom-right'
data-html='true'
)
-span.caret
-
+span.icon.fa.fa-caret-down
mixin table-result-heading-scan
[ignite] branch master updated: IGNITE-9799 Web Console: Removed unused code.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 0e6bcd3 IGNITE-9799 Web Console: Removed unused code.
0e6bcd3 is described below
commit 0e6bcd3120b89f013462e6c4606086edec344f6d
Author: Alexey Kuznetsov
AuthorDate: Fri Apr 5 11:25:11 2019 +0700
IGNITE-9799 Web Console: Removed unused code.
---
modules/web-console/frontend/package-lock.json | 27 --
1 file changed, 27 deletions(-)
diff --git a/modules/web-console/frontend/package-lock.json
b/modules/web-console/frontend/package-lock.json
index 1d9558b..459e517 100644
--- a/modules/web-console/frontend/package-lock.json
+++ b/modules/web-console/frontend/package-lock.json
@@ -1437,11 +1437,6 @@
"resolved":
"https://registry.npmjs.org/angular-aria/-/angular-aria-1.7.6.tgz;,
"integrity":
"sha512-Odq3piJl1uc85h0vpHO+0ZSfqY+nc4PNmjl+9dIEkTBpfH+dGvGQxaldpTL54YQIP09hOPi7jkrRlEYa/rMzsg=="
},
-"angular-cookies": {
- "version": "1.7.6",
- "resolved":
"https://registry.npmjs.org/angular-cookies/-/angular-cookies-1.7.6.tgz;,
- "integrity":
"sha512-BkwpZEruj2crsegrOJJvDIWjEBnIAK9PFq39y5rLtiqc2hOXYTs+sVzgq9qit2dlqZTH+xPIaiP2LXADv64W6g=="
-},
"angular-drag-and-drop-lists": {
"version": "1.4.0",
"resolved":
"https://registry.npmjs.org/angular-drag-and-drop-lists/-/angular-drag-and-drop-lists-1.4.0.tgz;,
@@ -1463,11 +1458,6 @@
"integrity":
"sha512-t3eQmuAZczdOVdOQj7muCBwH+MBNwd+/FaAsV1SNp+597EQVWABQwxI6KXE0k0ZlyJ5JbtkNIKU8kGAj1znxhw==",
"dev": true
},
-"angular-motion": {
- "version": "0.4.4",
- "resolved":
"https://registry.npmjs.org/angular-motion/-/angular-motion-0.4.4.tgz;,
- "integrity": "sha1-/EozZDOD697cI5ZEaLYMJqMC8jg="
-},
"angular-nvd3": {
"version": "1.0.9",
"resolved":
"https://registry.npmjs.org/angular-nvd3/-/angular-nvd3-1.0.9.tgz;,
@@ -1506,11 +1496,6 @@
"resolved":
"https://registry.npmjs.org/angular-tree-control/-/angular-tree-control-0.2.28.tgz;,
"integrity": "sha1-bPWNWQ7o4FA7uoma5SmuS4dBCDs="
},
-"angular-ui-carousel": {
- "version": "0.1.10",
- "resolved":
"https://registry.npmjs.org/angular-ui-carousel/-/angular-ui-carousel-0.1.10.tgz;,
- "integrity": "sha1-ClsQZgGLQOcAuMbuNLDJf8MhlSs="
-},
"angular-ui-grid": {
"version": "4.6.1",
"resolved":
"https://registry.npmjs.org/angular-ui-grid/-/angular-ui-grid-4.6.1.tgz;,
@@ -6921,12 +6906,6 @@
"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
"dev": true
},
-"jasmine-core": {
- "version": "2.6.4",
- "resolved":
"https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.6.4.tgz;,
- "integrity": "sha1-3skmzQqfoof7bbXHVfpIfnTOysU=",
- "dev": true
-},
"jquery": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz;,
@@ -6984,12 +6963,6 @@
"bignumber.js": "^7.0.0"
}
},
-"json-loader": {
- "version": "0.5.7",
- "resolved":
"https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz;,
- "integrity":
"sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
- "dev": true
-},
"json-parse-better-errors": {
"version": "1.0.2",
"resolved":
"https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz;,
[ignite] branch master updated: IGNITE-10214 Web Console: Improved support for JDBC drivers for project generation.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 5aa1481 IGNITE-10214 Web Console: Improved support for JDBC drivers
for project generation.
5aa1481 is described below
commit 5aa1481aa645b0d42992b49b6e22cd440575e160
Author: Vasiliy Sisko
AuthorDate: Fri Mar 29 14:03:58 2019 +0700
IGNITE-10214 Web Console: Improved support for JDBC drivers for project
generation.
---
modules/web-console/backend/app/schemas.js | 1 +
.../components/modal-import-models/component.js| 14 +++-
.../components/cache-edit-form/controller.ts | 10 +++
.../components/cache-edit-form/templates/store.pug | 18 +++--
.../templates/checkpoint/jdbc.pug | 4 +-
.../templates/general/discovery/jdbc.pug | 4 +-
.../generator/configuration.module.js | 4 +-
.../generator/ArtifactVersionChecker.service.js| 86 ++
.../generator/generator/ConfigurationGenerator.js | 72 +++---
.../generator/generator/Maven.service.js | 38 ++
.../frontend/app/configuration/index.ts| 9 ++-
.../frontend/app/configuration/mixins.pug | 3 +-
.../frontend/app/configuration/services/Caches.ts | 13 +++-
.../app/configuration/services/Clusters.ts | 16 ++--
.../frontend/app/data/pom-dependencies.json| 10 +--
.../app/primitives/form-field/dropdown.pug | 4 +-
.../console/agent/handlers/DatabaseListener.java | 28 ++-
17 files changed, 274 insertions(+), 60 deletions(-)
diff --git a/modules/web-console/backend/app/schemas.js
b/modules/web-console/backend/app/schemas.js
index 10c294f..29ec9b4 100644
--- a/modules/web-console/backend/app/schemas.js
+++ b/modules/web-console/backend/app/schemas.js
@@ -226,6 +226,7 @@ module.exports.factory = function(mongoose) {
type: String,
enum: ['Generic', 'Oracle', 'DB2', 'SQLServer', 'MySQL',
'PostgreSQL', 'H2']
},
+implementationVersion: String,
batchSize: Number,
maximumPoolSize: Number,
maximumWriteAttempts: Number,
diff --git
a/modules/web-console/frontend/app/configuration/components/modal-import-models/component.js
b/modules/web-console/frontend/app/configuration/components/modal-import-models/component.js
index b1439e5..9fe23ec 100644
---
a/modules/web-console/frontend/app/configuration/components/modal-import-models/component.js
+++
b/modules/web-console/frontend/app/configuration/components/modal-import-models/component.js
@@ -375,6 +375,12 @@ export class ModalImportModels {
},
{
db: 'MySQL',
+jdbcDriverClass: 'com.mysql.cj.jdbc.Driver',
+jdbcUrl: 'jdbc:mysql://[host]:[port]/[database]',
+user: 'root'
+},
+{
+db: 'MySQL',
jdbcDriverClass: 'org.mariadb.jdbc.Driver',
jdbcUrl: 'jdbc:mariadb://[host]:[port]/[database]',
user: 'root'
@@ -452,6 +458,7 @@ export class ModalImportModels {
result.jdbcDriverJar = selectedJdbcJar.jdbcDriverJar;
result.jdbcDriverClass = selectedJdbcJar.jdbcDriverClass;
+result.jdbcDriverImplementationVersion =
selectedJdbcJar.jdbcDriverImplementationVersion;
return result;
}
@@ -818,7 +825,8 @@ export class ModalImportModels {
kind: 'CacheJdbcPojoStoreFactory',
CacheJdbcPojoStoreFactory: {
dataSourceBean: 'ds' + dialect + '_' + catalog,
-dialect
+dialect,
+implementationVersion:
$scope.selectedPreset.jdbcDriverImplementationVersion
},
CacheJdbcBlobStoreFactory: { connectVia:
'DataSource' }
};
@@ -1040,7 +1048,8 @@ export class ModalImportModels {
label: drv.jdbcDriverJar,
value: {
jdbcDriverJar: drv.jdbcDriverJar,
-jdbcDriverClass: drv.jdbcDriverCls
+jdbcDriverClass: drv.jdbcDriverCls,
+jdbcDriverImplementationVersion:
drv.jdbcDriverImplVersion
}
});
});
@@ -1093,6 +1102,7 @@ export class ModalImportModels {
selectedPreset.db = foundPreset.db;
selectedPreset.jdbcDriverJar
[ignite] branch master updated: IGNITE-11259 Web Console: Added missing "enumValues" to binary configuration.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 01c45aa IGNITE-11259 Web Console: Added missing "enumValues" to
binary configuration.
01c45aa is described below
commit 01c45aad5b19c29e810eb6373d53019d1f7d220d
Author: Vasiliy Sisko
AuthorDate: Fri Mar 29 13:17:02 2019 +0700
IGNITE-11259 Web Console: Added missing "enumValues" to binary
configuration.
---
modules/web-console/backend/app/schemas.js | 3 ++-
.../cluster-edit-form/templates/binary.pug | 26 ++
.../generator/generator/ConfigurationGenerator.js | 4 +++-
.../generator/defaults/Cluster.service.js | 7 +-
.../frontend/app/configuration/mixins.pug | 18 +++
.../WebConsoleConfigurationSelfTest.java | 1 +
6 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/modules/web-console/backend/app/schemas.js
b/modules/web-console/backend/app/schemas.js
index 808bfd4..10c294f 100644
--- a/modules/web-console/backend/app/schemas.js
+++ b/modules/web-console/backend/app/schemas.js
@@ -590,7 +590,8 @@ module.exports.factory = function(mongoose) {
idMapper: String,
nameMapper: String,
serializer: String,
-enum: Boolean
+enum: Boolean,
+enumValues: [String]
}],
compactFooter: Boolean
},
diff --git
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/binary.pug
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/binary.pug
index aa74620..07b02a6 100644
---
a/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/binary.pug
+++
b/modules/web-console/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/binary.pug
@@ -105,6 +105,32 @@ panel-collapsible(ng-form=form
on-open=`ui.loadPanel('${form}')`)
name: 'enum',
tip: 'Flag indicating that this type is
the enum'
})
+.pc-form-grid-col-60(ng-if='$item.enum')
+mixin enum-values
+.ignite-form-field
+-let items = '$item.enumValues'
+
+list-editable(
+ng-model=items
+name='enumValues'
+list-editable-cols=`::[{name:
"Enum values:"}]`
+)
+list-editable-item-view {{ $item }}
+
+list-editable-item-edit
+
+list-java-identifier-field('Value', '$item', '"value"', 'Enter Enum value',
'$item.$item.enumValues')
++form-field__error({error:
'igniteUnique', message: 'Value already configured!'})
+
+list-editable-no-items
+list-editable-add-item-button(
+
add-item=`$editLast((${items} = ${items} || []).push(''))`
+label-single='enum value'
+label-multiple='enum
values'
+)
+
+- var form = '$parent.$parent.form'
++enum-values
+- var form = '$parent.form'
list-editable-no-items
list-editable-add-item-button(
diff --git
a/modules/web-console/frontend/app/configuration/generator/generator/ConfigurationGenerator.js
b/modules/web-console/frontend/app/configuration/generator/generator/ConfigurationGenerator.js
index b330f6e..358a453 100644
---
a/modules/web-console/frontend/app/configuration/generator/generator/ConfigurationGenerator.js
+++
b/modules/web-console/frontend/app/configuration/generator/generator/ConfigurationGenerator.js
@@ -27,6 +27,7 @@ import IgniteIGFSDefaults from './defaults/IGFS.service';
import JavaTypes from '../../../services/JavaTypes.service';
import VersionService from 'app/services/Version.service';
+import _ from 'lodash';
import isNil from 'lodash/isNil';
import {nonNil, nonEmpty} from 'app
[ignite] branch master updated: IGNITE-11135 Web Console: Fixed incorrect time format in the chart's tooltip.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 2fd6580 IGNITE-11135 Web Console: Fixed incorrect time format in the
chart's tooltip.
2fd6580 is described below
commit 2fd6580ea0c2f7dd4d9f9480a9352d4201424416
Author: Ilya Borisov
AuthorDate: Thu Mar 28 21:16:16 2019 +0700
IGNITE-11135 Web Console: Fixed incorrect time format in the chart's
tooltip.
---
.../frontend/app/components/ignite-chart/controller.js| 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git
a/modules/web-console/frontend/app/components/ignite-chart/controller.js
b/modules/web-console/frontend/app/components/ignite-chart/controller.js
index b611250..39707b3 100644
--- a/modules/web-console/frontend/app/components/ignite-chart/controller.js
+++ b/modules/web-console/frontend/app/components/ignite-chart/controller.js
@@ -16,6 +16,7 @@
*/
import _ from 'lodash';
+import moment from 'moment';
/**
* @typedef {{x: number, y: {[key: string]: number}}} IgniteChartDataPoint
@@ -29,6 +30,18 @@ const RANGE_RATE_PRESET = [
{label: '30 min', value: 30}
];
+/**
+ * Determines what label format was chosen by determineLabelFormat function
+ * in Chart.js streaming plugin.
+ *
+ * @param {string} label
+ */
+const inferLabelFormat = (label) => {
+if (label.match(/\.\d{3} (am|pm)$/)) return 'MMM D, h:mm:ss.SSS a';
+if (label.match(/:\d{1,2} (am|pm)$/)) return 'MMM D, h:mm:ss a';
+if (label.match(/ \d{4}$/)) return 'MMM D, ';
+};
+
export class IgniteChartController {
/** @type {import('chart.js').ChartConfiguration} */
chartOptions;
@@ -197,7 +210,7 @@ export class IgniteChartController {
bodyFontSize: 13,
callbacks: {
title: (tooltipItem) => {
-return tooltipItem[0].xLabel.slice(0, -7);
+return tooltipItem[0].xLabel =
moment(tooltipItem[0].xLabel,
inferLabelFormat(tooltipItem[0].xLabel)).format('HH:mm:ss');
},
label: (tooltipItem, data) => {
const label =
data.datasets[tooltipItem.datasetIndex].label || '';
[ignite] branch master updated: IGNITE-11645 Web Console: Fixed failing e2e test.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new ab57fbc IGNITE-11645 Web Console: Fixed failing e2e test.
ab57fbc is described below
commit ab57fbc897b5c02d5ef4af4d171f413389f1b6b9
Author: Ilya Borisov
AuthorDate: Thu Mar 28 17:25:51 2019 +0700
IGNITE-11645 Web Console: Fixed failing e2e test.
---
modules/web-console/e2e/testcafe/fixtures/auth/signup.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/web-console/e2e/testcafe/fixtures/auth/signup.js
b/modules/web-console/e2e/testcafe/fixtures/auth/signup.js
index 44b199f..062d96a 100644
--- a/modules/web-console/e2e/testcafe/fixtures/auth/signup.js
+++ b/modules/web-console/e2e/testcafe/fixtures/auth/signup.js
@@ -57,7 +57,7 @@ test('Server validation', async(t) => {
});
await t
.click(page.signupButton)
-.expect(errorNotification.withText('A user with the given username is
already registered').exists).ok('Shows global error')
+.expect(errorNotification.withText('A user with the given email is
already registered').exists).ok('Shows global error')
.expect(page.email.getError('server').exists).ok('Marks email input as
server-invalid');
});
test('Successful signup', async(t) => {
[ignite] branch master updated: IGNITE-11638 Web console: Fixed 'Explain query' logic.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new fecfa26 IGNITE-11638 Web console: Fixed 'Explain query' logic.
fecfa26 is described below
commit fecfa265183729a9dcb816d3aeb1c754442d3b52
Author: Andrey Novikov
AuthorDate: Wed Mar 27 21:31:04 2019 +0700
IGNITE-11638 Web console: Fixed 'Explain query' logic.
---
.../components/queries-notebook/controller.ts | 19 +++
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git
a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts
b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts
index ba31155..372513a 100644
---
a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts
+++
b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts
@@ -1753,26 +1753,21 @@ export class NotebookCtrl {
from(_chooseNode(paragraph.cacheName, false)).pipe(
switchMap((nid) => {
-const args = paragraph.queryArgs = {
+const qryArg = paragraph.queryArgs = {
+nid,
cacheName: $scope.cacheNameForSql(paragraph),
query: 'EXPLAIN ' + (paragraph.partialQuery ||
paragraph.query),
-pageSize: paragraph.pageSize
-};
-
-ActivitiesData.post({ group: 'sql', action:
'/queries/explain' });
-
-const qryArg = {
-nid,
-cacheName: args.cacheName,
-query: args.query,
nonCollocatedJoins,
enforceJoinOrder,
replicatedOnly: false,
local: false,
-pageSize: args.pageSize,
-lazy: false, collocated
+pageSize: paragraph.pageSize,
+lazy: false,
+collocated
};
+ActivitiesData.post({ group: 'sql', action:
'/queries/explain' });
+
return _executeQuery(
paragraph,
qryArg,
[ignite] branch master updated: IGNITE-11636 Web console: Fixed cluster switch logic. #6352
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 6ca2476 IGNITE-11636 Web console: Fixed cluster switch logic. #6352
6ca2476 is described below
commit 6ca2476f6e481ac80f5942b751087509bd315aa8
Author: Andrey Novikov
AuthorDate: Wed Mar 27 18:31:59 2019 +0700
IGNITE-11636 Web console: Fixed cluster switch logic. #6352
---
.../web-console/frontend/app/components/cluster-selector/controller.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/modules/web-console/frontend/app/components/cluster-selector/controller.js
b/modules/web-console/frontend/app/components/cluster-selector/controller.js
index 98e9043..97dd3b7 100644
--- a/modules/web-console/frontend/app/components/cluster-selector/controller.js
+++ b/modules/web-console/frontend/app/components/cluster-selector/controller.js
@@ -65,7 +65,7 @@ export default class {
}
change(item) {
-this.agentMgr.switchCluster(this.cluster)
+this.agentMgr.switchCluster(item)
.then(() => this.cluster = item)
.catch((err) => {
if (!(err instanceof CancellationError))
[ignite] branch master updated: IGNITE-9799 Web Console: Removed unused code.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new e3a6aac IGNITE-9799 Web Console: Removed unused code.
e3a6aac is described below
commit e3a6aac8174121ea5efa454fd3a3367eea040666
Author: Alexander Kalinin
AuthorDate: Mon Mar 25 21:50:03 2019 +0700
IGNITE-9799 Web Console: Removed unused code.
---
modules/web-console/frontend/app/app.js| 1 -
.../frontend/app/components/page-landing/index.js | 13 +
.../app/components/page-landing/template.pug | 4 +-
modules/web-console/frontend/app/vendor.js | 3 --
modules/web-console/frontend/package.json | 5 --
.../public/images/page-landing-carousel-2.png | Bin 34564 -> 0 bytes
.../public/images/page-landing-carousel-3.png | Bin 27808 -> 0 bytes
...g-carousel-1.png => page-landing-ui-sample.png} | Bin
.../frontend/public/stylesheets/style.scss | 60 +
9 files changed, 62 insertions(+), 24 deletions(-)
diff --git a/modules/web-console/frontend/app/app.js
b/modules/web-console/frontend/app/app.js
index 64e0152..4d048ab 100644
--- a/modules/web-console/frontend/app/app.js
+++ b/modules/web-console/frontend/app/app.js
@@ -176,7 +176,6 @@ export default angular
'ui.grid.saveState',
'ui.grid.selection',
'ui.router',
-'ui.carousel',
// Base modules.
'ignite-console.core',
'ignite-console.ace',
diff --git a/modules/web-console/frontend/app/components/page-landing/index.js
b/modules/web-console/frontend/app/components/page-landing/index.js
index cabb5bbde..b893279 100644
--- a/modules/web-console/frontend/app/components/page-landing/index.js
+++ b/modules/web-console/frontend/app/components/page-landing/index.js
@@ -27,18 +27,7 @@ export default angular
'ignite-console.user'
])
.component('pageLanding', {
-template,
-controller: class LandingController {
-static images = [
-'/images/page-landing-carousel-1.png',
-'/images/page-landing-carousel-2.png',
-'/images/page-landing-carousel-3.png'
-];
-
-$onInit() {
-this.images = LandingController.images;
-}
-}
+template
})
.config(['$stateProvider', function($stateProvider) {
// set up the states
diff --git
a/modules/web-console/frontend/app/components/page-landing/template.pug
b/modules/web-console/frontend/app/components/page-landing/template.pug
index ffbc3f2..a0ddc86 100644
--- a/modules/web-console/frontend/app/components/page-landing/template.pug
+++ b/modules/web-console/frontend/app/components/page-landing/template.pug
@@ -22,9 +22,7 @@ section.intro-container-wrapper
p It provides an interactive configuration wizard which helps you
create and download configuration files and code snippets for your Apache
Ignite projects. Additionally, the tool allows you to automatically load SQL
metadata from any RDBMS, run SQL queries on your in-memory cache, and view
execution plans, in-memory schema, and streaming charts.
a#signup_show.btn.btn-lg.btn-primary.btn-custom(ui-sref='signup')
Sign Up
.col-lg-6.col-md-6.col-sm-6.col-xs-12
-ui-carousel(slides='$ctrl.images' autoplay='true'
slides-to-show='1' arrows='false')
-carousel-item
-img(src='{{item}}')
+img(src='/images/page-landing-ui-sample.png')
section.features-container-wrapper
.container.features-container
.section-title The Web Console allows you to:
diff --git a/modules/web-console/frontend/app/vendor.js
b/modules/web-console/frontend/app/vendor.js
index 1c6e9ab..2800739 100644
--- a/modules/web-console/frontend/app/vendor.js
+++ b/modules/web-console/frontend/app/vendor.js
@@ -51,12 +51,9 @@ import 'file-saver';
import 'jszip';
import 'nvd3';
import 'lodash';
-import 'angular-ui-carousel';
import 'angular-gridster/dist/angular-gridster.min.css';
import 'angular-tree-control/css/tree-control-attribute.css';
import 'angular-tree-control/css/tree-control.css';
import 'angular-ui-grid/ui-grid.css';
-import 'angular-motion/dist/angular-motion.css';
import 'nvd3/build/nv.d3.css';
-import 'angular-ui-carousel/dist/ui-carousel.css';
diff --git a/modules/web-console/frontend/package.json
b/modules/web-console/frontend/package.json
index 998e51f..d24adfe 100644
--- a/modules/web-console/frontend/package.json
+++ b/modules/web-console/frontend/package.json
@@ -34,18 +34,15 @@
"angular-acl": "0.1.10",
"angular-animate": "1.7.6",
"angular-aria": "1.7.6",
-"angular-cookies": "1.7.6",
"angular-drag
[ignite] branch master updated: IGNITE-10538 Web Console: Check only distinct cluster states.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new a188139 IGNITE-10538 Web Console: Check only distinct cluster states.
a188139 is described below
commit a188139ff1cfe5b03fd7642ee18462ff3df3eca3
Author: Alexey Kuznetsov
AuthorDate: Mon Mar 18 17:13:16 2019 +0700
IGNITE-10538 Web Console: Check only distinct cluster states.
---
.../app/configuration/components/modal-import-models/component.js| 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/modules/web-console/frontend/app/configuration/components/modal-import-models/component.js
b/modules/web-console/frontend/app/configuration/components/modal-import-models/component.js
index 0dbf4f1..b1439e5 100644
---
a/modules/web-console/frontend/app/configuration/components/modal-import-models/component.js
+++
b/modules/web-console/frontend/app/configuration/components/modal-import-models/component.js
@@ -21,8 +21,8 @@ import _ from 'lodash';
import naturalCompare from 'natural-compare-lite';
import find from 'lodash/fp/find';
import get from 'lodash/fp/get';
-import {race, timer, merge, of, from, combineLatest, EMPTY} from 'rxjs';
-import {tap, filter, take, pluck, switchMap, map} from 'rxjs/operators';
+import {combineLatest, EMPTY, from, merge, of, race, timer} from 'rxjs';
+import {distinctUntilChanged, filter, map, pluck, switchMap, take, tap} from
'rxjs/operators';
import ObjectID from 'bson-objectid';
import {uniqueName} from 'app/utils/uniqueName';
import {defaultNames} from '../../defaultNames';
@@ -1066,6 +1066,7 @@ export class ModalImportModels {
this.agentIsAvailable$ = this.agentMgr.connectionSbj.pipe(
pluck('state'),
+distinctUntilChanged(),
map((state) => state !== 'AGENT_DISCONNECTED')
);
[ignite] branch master updated: WC-964 Web Console: Minor tweak of error message.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 9dd4f75 WC-964 Web Console: Minor tweak of error message.
9dd4f75 is described below
commit 9dd4f75580e26908a9543d23888086f80c2d559f
Author: Alexander Kalinin
AuthorDate: Thu Mar 7 23:18:28 2019 +0700
WC-964 Web Console: Minor tweak of error message.
---
modules/web-console/backend/app/schemas.js | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/modules/web-console/backend/app/schemas.js
b/modules/web-console/backend/app/schemas.js
index fe3c637..808bfd4 100644
--- a/modules/web-console/backend/app/schemas.js
+++ b/modules/web-console/backend/app/schemas.js
@@ -55,7 +55,10 @@ module.exports.factory = function(mongoose) {
// Install passport plugin.
Account.plugin(passportMongo, {
usernameField: 'email', limitAttempts: true, lastLoginField:
'lastLogin',
-usernameLowerCase: true
+usernameLowerCase: true,
+errorMessages: {
+UserExistsError: 'A user with the given email is already
registered'
+}
});
const transform = (doc, ret) => {
[ignite] branch master updated: IGNITE-11506 Web console: Tweak CSS to show long user name.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 06c70c5 IGNITE-11506 Web console: Tweak CSS to show long user name.
06c70c5 is described below
commit 06c70c56ad601f231ff246f01ce4d92d94c785a6
Author: Ilya Borisov
AuthorDate: Thu Mar 7 22:48:27 2019 +0700
IGNITE-11506 Web console: Tweak CSS to show long user name.
---
.../frontend/app/components/breadcrumbs/style.scss| 5 ++---
.../web-console-header/components/user-menu/style.scss| 15 +++
.../web-console-header/components/user-menu/template.pug | 4 ++--
.../web-console/frontend/public/stylesheets/style.scss| 2 +-
4 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/modules/web-console/frontend/app/components/breadcrumbs/style.scss
b/modules/web-console/frontend/app/components/breadcrumbs/style.scss
index f0a98ee..1638ea6 100644
--- a/modules/web-console/frontend/app/components/breadcrumbs/style.scss
+++ b/modules/web-console/frontend/app/components/breadcrumbs/style.scss
@@ -18,13 +18,12 @@
breadcrumbs {
$side-margin: 5px;
-padding-left: $side-margin;
-padding-right: $side-margin;
+padding: 3px $side-margin;
display: inline-flex;
align-items: center;
flex-direction: row;
-height: 26px;
+min-height: 20px;
border-radius: 4px;
background-color: rgba(197, 197, 197, 0.1);
font-size: 12px;
diff --git
a/modules/web-console/frontend/app/components/web-console-header/components/user-menu/style.scss
b/modules/web-console/frontend/app/components/web-console-header/components/user-menu/style.scss
index 898047b..9d9e3e3 100644
---
a/modules/web-console/frontend/app/components/web-console-header/components/user-menu/style.scss
+++
b/modules/web-console/frontend/app/components/web-console-header/components/user-menu/style.scss
@@ -18,11 +18,26 @@
user-menu {
--active-link-color: #ee2b27;
font-size: 14px;
+max-width: 150px;
+max-height: 100%;
+display: flex;
&>.active {
color: var(--active-link-color)
}
.caret {
margin-left: 8px;
+margin-top: 3px;
+align-self: center;
+}
+.user-menu__username {
+text-overflow: ellipsis;
+overflow: hidden;
+white-space: nowrap;
+}
+.user-menu__trigger {
+display: flex;
+max-height: 100%;
+overflow: hidden;
}
}
\ No newline at end of file
diff --git
a/modules/web-console/frontend/app/components/web-console-header/components/user-menu/template.pug
b/modules/web-console/frontend/app/components/web-console-header/components/user-menu/template.pug
index e946c78..4940e52 100644
---
a/modules/web-console/frontend/app/components/web-console-header/components/user-menu/template.pug
+++
b/modules/web-console/frontend/app/components/web-console-header/components/user-menu/template.pug
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-div(
+div.user-menu__trigger(
ng-class='{active: $ctrl.$state.includes("base.settings")}'
ng-click='$event.stopPropagation()'
bs-dropdown='$ctrl.items'
@@ -22,5 +22,5 @@ div(
data-trigger='hover focus'
data-container='self'
)
-span {{$ctrl.user.firstName}} {{$ctrl.user.lastName}}
+span.user-menu__username {{$ctrl.user.firstName}} {{$ctrl.user.lastName}}
span.caret
\ No newline at end of file
diff --git a/modules/web-console/frontend/public/stylesheets/style.scss
b/modules/web-console/frontend/public/stylesheets/style.scss
index a8b9a10..be31060 100644
--- a/modules/web-console/frontend/public/stylesheets/style.scss
+++ b/modules/web-console/frontend/public/stylesheets/style.scss
@@ -2071,7 +2071,7 @@ header.header-with-selector {
h1 {
-height: 36px;
+min-height: 36px;
margin: 0;
margin-right: 8px;
[ignite] branch master updated: IGNITE-11497 Web console: Tuned "index.html" caching options.
This is an automated email from the ASF dual-hosted git repository. akuznetsov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git The following commit(s) were added to refs/heads/master by this push: new 051cc06 IGNITE-11497 Web console: Tuned "index.html" caching options. 051cc06 is described below commit 051cc0629c3a8a5ad9721ea2e7a8566d72a14c6f Author: Ilya Borisov AuthorDate: Thu Mar 7 22:37:38 2019 +0700 IGNITE-11497 Web console: Tuned "index.html" caching options. --- modules/web-console/frontend/views/index.pug | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/web-console/frontend/views/index.pug b/modules/web-console/frontend/views/index.pug index 6029993..71d5363 100644 --- a/modules/web-console/frontend/views/index.pug +++ b/modules/web-console/frontend/views/index.pug @@ -21,6 +21,8 @@ html meta(http-equiv='content-type' content='text/html; charset=utf-8') meta(http-equiv='content-language' content='en') +meta(http-equiv="Cache-control" content="no-cache, no-store, must-revalidate") +meta(http-equiv="Pragma" content="no-cache") meta(http-equiv='X-UA-Compatible' content='IE=Edge') meta(name='viewport' content='width=device-width, height=device-height, initial-scale=1.0, minimum-scale=1.0')
[ignite] branch master updated: IGNITE-8420 Web console: Fixed test.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new b77fd79 IGNITE-8420 Web console: Fixed test.
b77fd79 is described below
commit b77fd793f370bfa2bfe642382ab656f8c93e9564
Author: Alexander Kalinin
AuthorDate: Tue Mar 5 17:07:25 2019 +0700
IGNITE-8420 Web console: Fixed test.
---
.../web-console/frontend/app/configuration/store/reducer.spec.js | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git
a/modules/web-console/frontend/app/configuration/store/reducer.spec.js
b/modules/web-console/frontend/app/configuration/store/reducer.spec.js
index 91952cc..19bf663 100644
--- a/modules/web-console/frontend/app/configuration/store/reducer.spec.js
+++ b/modules/web-console/frontend/app/configuration/store/reducer.spec.js
@@ -57,9 +57,12 @@ suite('page-configure component reducer', () => {
test('REMOVE_CLUSTERS action', () => {
assert.deepEqual(
-reducer({}, {type: REMOVE_CLUSTERS}),
-{},
-'does nothing yet'
+reducer(
+{clusters: new Map([[1, {_id: 1, name: 'Cluster 1'}], [2,
{_id: 2, name: 'Cluster 2'}]])},
+{type: REMOVE_CLUSTERS, clusterIDs: [1]}
+),
+{clusters: new Map([[2, {_id: 2, name: 'Cluster 2'}]])},
+'deletes clusters by id'
);
});
[ignite] branch master updated: IGNITE-8420. Web console Restored muted tests. Deleted unused tests.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 23afdde2 IGNITE-8420. Web console Restored muted tests. Deleted unused
tests.
23afdde2 is described below
commit 23afdde2ba7452346124229489d0f835a2c8c3a8
Author: Alexander Kalinin
AuthorDate: Tue Mar 5 16:00:18 2019 +0700
IGNITE-8420. Web console Restored muted tests. Deleted unused tests.
---
.../component.spec.js | 8 +-
.../page-configure-basic/controller.spec.js| 206 --
.../page-configure-basic/reducer.spec.js | 19 +-
.../components/page-configure-basic/reducer.ts | 22 +-
.../generator/generator/JavaTransformer.spec.js| 55 -
.../generator/generator/SharpTransformer.spec.js | 53 -
.../generator/generator/SpringTransformer.spec.js | 54 -
.../services/ConfigurationDownload.spec.js | 22 +-
.../configuration/services/PageConfigure.spec.js | 240 -
.../app/configuration/store/reducer.spec.js| 24 ++-
.../frontend/app/services/Version.service.js | 104 -
.../frontend/app/services/Version.spec.js | 18 +-
12 files changed, 126 insertions(+), 699 deletions(-)
diff --git
a/modules/web-console/frontend/app/components/list-editable/components/list-editable-add-item-button/component.spec.js
b/modules/web-console/frontend/app/components/list-editable/components/list-editable-add-item-button/component.spec.js
index 9e37319..06c6b84 100644
---
a/modules/web-console/frontend/app/components/list-editable/components/list-editable-add-item-button/component.spec.js
+++
b/modules/web-console/frontend/app/components/list-editable/components/list-editable-add-item-button/component.spec.js
@@ -21,7 +21,7 @@ import {spy} from 'sinon';
import {ListEditableAddItemButton as Ctrl} from './component';
suite('list-editable-add-item-button component', () => {
-test.skip('has addItem method with correct locals', () => {
+test('has addItem method with correct locals', () => {
const i = new Ctrl();
i._listEditable = {
ngModel: {
@@ -32,10 +32,9 @@ suite('list-editable-add-item-button component', () => {
i._addItem = spy();
i.addItem();
assert.isOk(i._addItem.calledOnce);
-assert.deepEqual(i._addItem.lastCall.args[0], {
-$edit: i._listEditable.ngModel.editListItem
-});
+assert.deepEqual(i._addItem.lastCall.args[0].$edit,
i._listEditable.ngModel.editListItem );
});
+
test('inserts button after list-editable', () => {
Ctrl.hasItemsTemplate = 'tpl';
const $scope = {};
@@ -57,6 +56,7 @@ suite('list-editable-add-item-button component', () => {
assert.equal($transclude.lastCall.args[0], $scope);
assert.equal(clone.insertAfter.lastCall.args[0],
i._listEditable.$element);
});
+
test('exposes hasItems getter', () => {
const i = new Ctrl();
i._listEditable = {
diff --git
a/modules/web-console/frontend/app/configuration/components/page-configure-basic/controller.spec.js
b/modules/web-console/frontend/app/configuration/components/page-configure-basic/controller.spec.js
deleted file mode 100644
index a4a1d30..000
---
a/modules/web-console/frontend/app/configuration/components/page-configure-basic/controller.spec.js
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * 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.
- */
-
-import {suite, test} from 'mocha';
-import {assert} from 'chai';
-import {spy} from 'sinon';
-
-import {TestScheduler} from 'rxjs/testing';
-import {Subscriber, Subject, BehaviorSubject} from 'rxjs';
-import Controller from './controller';
-
-const mocks = () => new Map([
-['$scope', {
-$applyAsync: spy((fn) => fn())
-}],
-['pageService', {
-setCluster: spy()
-}],
-['Clusters', {
-discoveries: 1,
-minMemoryPolicySize: 1000
-}],
-['ConfigureState', {
-state$: new
[ignite] branch master updated: IGNITE-11374 Web Console: regenerated package-lock.json
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 545a627 IGNITE-11374 Web Console: regenerated package-lock.json
545a627 is described below
commit 545a627a7b8f562605408643eabdb39bdb3bc070
Author: Alexey Kuznetsov
AuthorDate: Tue Feb 26 15:23:48 2019 +0700
IGNITE-11374 Web Console: regenerated package-lock.json
---
modules/web-console/frontend/package-lock.json | 33 --
1 file changed, 33 deletions(-)
diff --git a/modules/web-console/frontend/package-lock.json
b/modules/web-console/frontend/package-lock.json
index 699e1da..1d9558b 100644
--- a/modules/web-console/frontend/package-lock.json
+++ b/modules/web-console/frontend/package-lock.json
@@ -1074,16 +1074,6 @@
"resolved": "https://registry.npmjs.org/@uirouter/rx/-/rx-0.5.0.tgz;,
"integrity":
"sha512-SHX1b8u8MW/7L6vFrKSRc5g5u/RgLakGMfdTeVQMSC84fc2yW7VDWNuGJhA8jiOTNKvzscuwvC02dxOgKcwrjg=="
},
-"@uirouter/visualizer": {
- "version": "4.0.2",
- "resolved":
"https://registry.npmjs.org/@uirouter/visualizer/-/visualizer-4.0.2.tgz;,
- "integrity":
"sha512-95T0g9HHAjEa+sqwzfSbF6HxBG3shp2oTeGvqYk3VcLEHzrgNopEKJojd+3GNcVznQ+MUAaX4EDHXrzaHKJT6Q==",
- "requires": {
-"d3-hierarchy": "^1.0.3",
-"d3-interpolate": "^1.1.3",
-"preact": "^7.2.0"
- }
-},
"@webassemblyjs/ast": {
"version": "1.7.6",
"resolved":
"https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.6.tgz;,
@@ -3523,24 +3513,6 @@
"resolved": "https://registry.npmjs.org/d3/-/d3-3.5.17.tgz;,
"integrity": "sha1-vEZ0gAQ3iyGjYMn8fPUjF5B2L7g="
},
-"d3-color": {
- "version": "1.2.3",
- "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.2.3.tgz;,
- "integrity":
"sha512-x37qq3ChOTLd26hnps36lexMRhNXEtVxZ4B25rL0DVdDsGQIJGB18S7y9XDwlDD6MD/ZBzITCf4JjGMM10TZkw=="
-},
-"d3-hierarchy": {
- "version": "1.1.8",
- "resolved":
"https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.8.tgz;,
- "integrity":
"sha512-L+GHMSZNwTpiq4rt9GEsNcpLa4M96lXMR8M/nMG9p5hBE0jy6C+3hWtyZMenPQdwla249iJy7Nx0uKt3n+u9+w=="
-},
-"d3-interpolate": {
- "version": "1.3.2",
- "resolved":
"https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.3.2.tgz;,
- "integrity":
"sha512-NlNKGopqaz9qM1PXh9gBF1KSCVh+jSFErrSlD/4hybwoNX/gt1d8CDbDW+3i+5UOHhjC6s6nMvRxcuoMVNgL2w==",
- "requires": {
-"d3-color": "1"
- }
-},
"dashdash": {
"version": "1.14.1",
"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz;,
@@ -9953,11 +9925,6 @@
}
}
},
-"preact": {
- "version": "7.2.1",
- "resolved": "https://registry.npmjs.org/preact/-/preact-7.2.1.tgz;,
- "integrity": "sha1-FZ4YkvYUmF5J6wqW/W5ti9+LvMU="
-},
"prelude-ls": {
"version": "1.1.2",
"resolved":
"https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz;,
[ignite] branch master updated: IGNITE-10890 Web Console: Removed legacy UI router events.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 52983ce IGNITE-10890 Web Console: Removed legacy UI router events.
52983ce is described below
commit 52983ceeff7886a63aef54df64f63772d962928b
Author: Alexander Kalinin
AuthorDate: Tue Feb 26 09:35:53 2019 +0700
IGNITE-10890 Web Console: Removed legacy UI router events.
---
modules/web-console/frontend/app/app.js | 17 -
.../components/queries-notebook/controller.ts | 6 ++
modules/web-console/frontend/app/vendor.js | 1 -
modules/web-console/frontend/package.json | 1 -
4 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/modules/web-console/frontend/app/app.js
b/modules/web-console/frontend/app/app.js
index c54a832..64e0152 100644
--- a/modules/web-console/frontend/app/app.js
+++ b/modules/web-console/frontend/app/app.js
@@ -176,7 +176,6 @@ export default angular
'ui.grid.saveState',
'ui.grid.selection',
'ui.router',
-'ui.router.state.events',
'ui.carousel',
// Base modules.
'ignite-console.core',
@@ -371,11 +370,11 @@ export default angular
}
])
.run(['$rootScope', '$http', '$state', 'IgniteMessages', 'User',
'IgniteNotebookData',
-/**
-* @param {ng.IRootScopeService} $root
-* @param {ng.IHttpService} $http
-* @param {ReturnType} Messages
-*/
+/**
+ * @param {ng.IRootScopeService} $root
+ * @param {ng.IHttpService} $http
+ * @param {ReturnType} Messages
+ */
($root, $http, $state, Messages, User, Notebook) => { //
eslint-disable-line no-shadow
$root.revertIdentity = () => {
$http.get('/api/v1/admin/revert/identity')
@@ -387,8 +386,8 @@ export default angular
}
])
.run(['IgniteIcon',
-/**
-* @param {import('./components/ignite-icon/service').default} IgniteIcon
-*/
+/**
+ * @param {import('./components/ignite-icon/service').default}
IgniteIcon
+ */
(IgniteIcon) => IgniteIcon.registerIcons(icons)
]);
diff --git
a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts
b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts
index 83e9723..7a96a91 100644
---
a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts
+++
b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts
@@ -18,7 +18,7 @@
import _ from 'lodash';
import {nonEmpty, nonNil} from 'app/utils/lodashMixins';
import id8 from 'app/utils/id8';
-import {timer, merge, defer, of, EMPTY} from 'rxjs';
+import {timer, merge, defer, of, EMPTY, from} from 'rxjs';
import {tap, switchMap, exhaustMap, take, pluck, distinctUntilChanged, filter,
map, catchError} from 'rxjs/operators';
import {CSV} from 'app/services/CSV';
@@ -278,13 +278,11 @@ export class NotebookCtrl {
paragraph.cancelRefresh($interval);
};
-const _stopTopologyRefresh = () => {
+this._stopTopologyRefresh = () => {
if ($scope.notebook && $scope.notebook.paragraphs)
$scope.notebook.paragraphs.forEach((paragraph) =>
_tryStopRefresh(paragraph));
};
-$scope.$on('$stateChangeStart', _stopTopologyRefresh);
-
$scope.caches = [];
$scope.pageSizesOptions = [
diff --git a/modules/web-console/frontend/app/vendor.js
b/modules/web-console/frontend/app/vendor.js
index d02b2ccf..1c6e9ab 100644
--- a/modules/web-console/frontend/app/vendor.js
+++ b/modules/web-console/frontend/app/vendor.js
@@ -26,7 +26,6 @@ import 'angular1-async-filter';
import 'angular-messages';
import '@uirouter/angularjs';
-import '@uirouter/angularjs/lib/legacy/stateEvents';
import 'resize-observer-polyfill';
diff --git a/modules/web-console/frontend/package.json
b/modules/web-console/frontend/package.json
index c6ecdaf..998e51f 100644
--- a/modules/web-console/frontend/package.json
+++ b/modules/web-console/frontend/package.json
@@ -30,7 +30,6 @@
"@uirouter/angularjs": "1.0.20",
"@uirouter/core": "5.0.19",
"@uirouter/rx": "0.5.0",
-"@uirouter/visualizer": "4.0.2",
"angular": "1.7.6",
"angular-acl": "0.1.10",
"angular-animate": "1.7.6",
[ignite] branch master updated: IGNITE-10914 Web Console: Fixed missing unique index on Accounts.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 7723c42 IGNITE-10914 Web Console: Fixed missing unique index on
Accounts.
7723c42 is described below
commit 7723c4278710c4e761b70c25bfcdfb07295510af
Author: Alexey Kuznetsov
AuthorDate: Tue Feb 26 09:21:19 2019 +0700
IGNITE-10914 Web Console: Fixed missing unique index on Accounts.
---
modules/web-console/backend/app/schemas.js | 2 +-
.../1547440382485-account-make-email-unique.js | 85 ++
.../app/components/list-editable/controller.ts | 6 +-
.../permanent-notifications/controller.ts | 4 +-
.../components/web-console-footer/controller.ts| 7 +-
.../components/user-menu/controller.ts | 5 +-
.../web-console-header-content/controller.ts | 3 +-
.../components/web-console-sidebar/controller.ts | 7 +-
.../web-console-sidebar-navigation/controller.ts | 6 +-
.../web-console-sidebar-overflow/controller.ts | 11 ++-
.../page-configure-advanced/controller.ts | 2 +-
.../configuration/services/ConfigChangesGuard.ts | 2 +-
.../app/configuration/services/ConfigureState.ts | 2 +-
.../web-console/frontend/app/store/effects/ui.ts | 2 +-
14 files changed, 125 insertions(+), 19 deletions(-)
diff --git a/modules/web-console/backend/app/schemas.js
b/modules/web-console/backend/app/schemas.js
index 2f6498f..fe3c637 100644
--- a/modules/web-console/backend/app/schemas.js
+++ b/modules/web-console/backend/app/schemas.js
@@ -37,7 +37,7 @@ module.exports.factory = function(mongoose) {
const Account = new Schema({
firstName: String,
lastName: String,
-email: String,
+email: {type: String, unique: true},
phone: String,
company: String,
country: String,
diff --git
a/modules/web-console/backend/migrations/1547440382485-account-make-email-unique.js
b/modules/web-console/backend/migrations/1547440382485-account-make-email-unique.js
new file mode 100644
index 000..787c767
--- /dev/null
+++
b/modules/web-console/backend/migrations/1547440382485-account-make-email-unique.js
@@ -0,0 +1,85 @@
+/*
+ * 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.
+ */
+
+const _ = require('lodash');
+
+const log = require('./migration-utils').log;
+
+function deduplicateAccounts(model) {
+const accountsModel = model('Account');
+const spaceModel = model('Space');
+
+return accountsModel.aggregate([
+{$group: {_id: '$email', count: {$sum: 1}}},
+{$match: {count: {$gt: 1}}}
+]).exec()
+.then((accounts) => _.map(accounts, '_id'))
+.then((emails) => Promise.all(
+_.map(emails, (email) => accountsModel.find({email}, {_id: 1,
email: 1, lastActivity: 1, lastLogin: 1}).lean().exec())
+))
+.then((promises) => {
+const duplicates = _.flatMap(promises, (accounts) =>
_.sortBy(accounts, [(a) => a.lastActivity || '', 'lastLogin']).slice(0, -1));
+
+if (_.isEmpty(duplicates))
+log('Duplicates not found!');
+else {
+log(`Duplicates found: ${_.size(duplicates)}`);
+
+_.forEach(duplicates, (dup) => log(` ID: ${dup._id}, e-mail:
${dup.email}`));
+}
+
+return _.map(duplicates, '_id');
+})
+.then((accountIds) => {
+if (_.isEmpty(accountIds))
+return Promise.resolve();
+
+return spaceModel.find({owner: {$in: accountIds}}, {_id:
1}).lean().exec()
+.then((spaces) => _.map(spaces, '_id'))
+.then((spaceIds) =>
+Promise.all([
+model('Cluster').remove({space: {$in:
spaceIds}}).exec(),
+model('Cache').remove({space: {$in: spaceIds}}).exec(),
+model('DomainModel').remove({space: {$in:
spaceIds}}).exec(),
+model('Igfs').remove({space: {$in: spaceIds}}).exec(),
[ignite] branch master updated: IGNITE-11338 Web Console: Fixed edit mode of "list-editable" component.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new b0bc736 IGNITE-11338 Web Console: Fixed edit mode of "list-editable"
component.
b0bc736 is described below
commit b0bc736924f49baf820df5682285e2041005b943
Author: Ilya Borisov
AuthorDate: Mon Feb 25 23:49:30 2019 +0700
IGNITE-11338 Web Console: Fixed edit mode of "list-editable" component.
---
.../{component.js => component.ts} | 27 ++-
.../{index.js => index.ts} | 0
.../{directive.js => directive.ts} | 31 +++-
.../list-editable-one-way/{index.js => index.ts} | 0
.../{directives.js => directives.ts} | 25 ++-
.../{index.js => index.ts} | 0
.../{directive.js => directive.ts} | 27 +++
.../{index.js => index.ts} | 0
.../list-editable/{controller.js => controller.ts} | 83 --
.../list-editable/{index.js => index.ts} | 0
.../app/components/list-editable/template.pug | 14 ++--
11 files changed, 87 insertions(+), 120 deletions(-)
diff --git
a/modules/web-console/frontend/app/components/list-editable/components/list-editable-add-item-button/component.js
b/modules/web-console/frontend/app/components/list-editable/components/list-editable-add-item-button/component.ts
similarity index 79%
rename from
modules/web-console/frontend/app/components/list-editable/components/list-editable-add-item-button/component.js
rename to
modules/web-console/frontend/app/components/list-editable/components/list-editable-add-item-button/component.ts
index 84ee1e8..793270f 100644
---
a/modules/web-console/frontend/app/components/list-editable/components/list-editable-add-item-button/component.js
+++
b/modules/web-console/frontend/app/components/list-editable/components/list-editable-add-item-button/component.ts
@@ -22,33 +22,20 @@ import './style.scss';
/**
* Adds "add new item" button to list-editable-no-items slot and after
list-editable
- * @type {ng.IComponentController}
*/
-export class ListEditableAddItemButton {
+export class ListEditableAddItemButton {
/**
* Template for button that's inserted after list-editable
- * @type {string}
*/
-static hasItemsTemplate = hasItemsTemplate;
-/** @type {ListEditable} */
-_listEditable;
-/** @type {string} */
-labelSingle;
-/** @type {string} */
-labelMultiple;
-/** @type {ng.ICompiledExpression} */
-_addItem;
+static hasItemsTemplate: string = hasItemsTemplate;
+_listEditable: ListEditable;
+labelSingle: string;
+labelMultiple: string;
+_addItem: ng.ICompiledExpression;
static $inject = ['$compile', '$scope'];
-/**
- * @param {ng.ICompileService} $compile
- * @param {ng.IScope} $scope
- */
-constructor($compile, $scope) {
-this.$compile = $compile;
-this.$scope = $scope;
-}
+constructor(private $compile: ng.ICompileService, private $scope:
ng.IScope) {}
$onDestroy() {
this._listEditable = this._hasItemsButton = null;
diff --git
a/modules/web-console/frontend/app/components/list-editable/components/list-editable-add-item-button/index.js
b/modules/web-console/frontend/app/components/list-editable/components/list-editable-add-item-button/index.ts
similarity index 100%
rename from
modules/web-console/frontend/app/components/list-editable/components/list-editable-add-item-button/index.js
rename to
modules/web-console/frontend/app/components/list-editable/components/list-editable-add-item-button/index.ts
diff --git
a/modules/web-console/frontend/app/components/list-editable/components/list-editable-one-way/directive.js
b/modules/web-console/frontend/app/components/list-editable/components/list-editable-one-way/directive.ts
similarity index 54%
rename from
modules/web-console/frontend/app/components/list-editable/components/list-editable-one-way/directive.js
rename to
modules/web-console/frontend/app/components/list-editable/components/list-editable-one-way/directive.ts
index 320791b..91b0441 100644
---
a/modules/web-console/frontend/app/components/list-editable/components/list-editable-one-way/directive.js
+++
b/modules/web-console/frontend/app/components/list-editable/components/list-editable-one-way/directive.ts
@@ -16,10 +16,9 @@
*/
import isMatch from 'lodash/isMatch';
-import {default as ListEditableController} from '../../controller';
+import {default as ListEditableController, ID} from '../../controller';
-/** @type {ng.IDirectiveFactory} */
-export default function listEditableOneWay() {
+export default function listEditableOneWay(): ng.IDirective {
return {
require: {
[ignite] branch master updated: IGNITE-11096 Web Agent: Implemented support for "--disable-demo".
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 71ae9c0 IGNITE-11096 Web Agent: Implemented support for
"--disable-demo".
71ae9c0 is described below
commit 71ae9c07627b8a677c49d70650f28eb05cec2d4d
Author: Vasiliy Sisko
AuthorDate: Mon Feb 25 23:16:32 2019 +0700
IGNITE-11096 Web Agent: Implemented support for "--disable-demo".
---
modules/web-console/backend/app/agentSocket.js | 23
modules/web-console/backend/app/agentsHandler.js | 13 +++--
modules/web-console/backend/app/browsersHandler.js | 2 +-
.../components/demo-mode-button/controller.ts | 31 +++---
.../app/modules/agent/AgentManager.service.js | 8 +++---
.../console/agent/handlers/RestListener.java | 3 +++
6 files changed, 41 insertions(+), 39 deletions(-)
diff --git a/modules/web-console/backend/app/agentSocket.js
b/modules/web-console/backend/app/agentSocket.js
index dfebda0..0df5c5e 100644
--- a/modules/web-console/backend/app/agentSocket.js
+++ b/modules/web-console/backend/app/agentSocket.js
@@ -113,29 +113,6 @@ module.exports.factory = function() {
}
/**
- * @param {String} token
- * @param {Array.} browserSockets
- */
-runDemoCluster(token, browserSockets) {
-this.emitEvent('demo:broadcast:start')
-.then(() => {
-this.demo.tokens.push(token);
-this.demo.browserSockets.push(...browserSockets);
-
-this.socket.on('demo:topology', (res) => {
-try {
-const top = this.restResultParse(res);
-
-_.forEach(this.demo.browserSockets, (sock) =>
sock.emit('topology', top));
-}
-catch (err) {
-_.forEach(this.demo.browserSockets, (sock) =>
sock.emit('topology:err', err));
-}
-});
-});
-}
-
-/**
* @param {Socket} browserSocket
*/
attachToDemoCluster(browserSocket) {
diff --git a/modules/web-console/backend/app/agentsHandler.js
b/modules/web-console/backend/app/agentsHandler.js
index fd55ac3..f6e3da9 100644
--- a/modules/web-console/backend/app/agentsHandler.js
+++ b/modules/web-console/backend/app/agentsHandler.js
@@ -347,7 +347,7 @@ module.exports.factory = function(settings, mongo,
AgentSocket) {
cb(null, activeTokens);
-return this.onConnect(sock, accounts,
activeTokens, disableDemo);
+return this.onConnect(sock, accounts,
activeTokens, !disableDemo);
})
// TODO IGNITE-1379 send error to web master.
.catch(() => cb(`Invalid token(s):
${tokens.join(',')}. Please reload agent archive or check settings`));
@@ -368,7 +368,16 @@ module.exports.factory = function(settings, mongo,
AgentSocket) {
if (_.isEmpty(socks))
return Promise.reject(new Error('Failed to find connected
agent for this account'));
-if (demo || _.isNil(clusterId))
+if (demo) {
+const sock = _.find(socks, (sock) => sock.demo.enabled);
+
+if (sock)
+return Promise.resolve(sock);
+
+return Promise.reject(new Error('Demo mode disabled by
administrator'));
+}
+
+if (_.isNil(clusterId))
return Promise.resolve(_.head(socks));
const sock = _.find(socks, (agentSock) => _.get(agentSock,
'cluster.id') === clusterId);
diff --git a/modules/web-console/backend/app/browsersHandler.js
b/modules/web-console/backend/app/browsersHandler.js
index 919b1f0..1bfba89 100644
--- a/modules/web-console/backend/app/browsersHandler.js
+++ b/modules/web-console/backend/app/browsersHandler.js
@@ -111,7 +111,7 @@ module.exports = {
.then((agentSocks) => {
const stat = _.reduce(agentSocks, (acc, agentSock) => {
acc.count += 1;
-acc.hasDemo |= _.get(agentSock, 'demo.enabled');
+acc.hasDemo = acc.hasDemo || _.get(agentSock,
'demo.enabled');
if (agentSock.cluster)
acc.clusters.push(agentSock.cluster);
diff --git
a/modules/web-console/frontend/app/components/web-console-header/components/demo-mode-button/controller.ts
b/modules/web-console/frontend/app/components/web-console-header/components/demo-mode-but
[ignite] branch master updated: IGNITE-11327 Web Console: Fixed error on progress line show/hide.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new fd821a3 IGNITE-11327 Web Console: Fixed error on progress line
show/hide.
fd821a3 is described below
commit fd821a3180c575e07be06ec9485605ee89fad9f5
Author: Alexander Kalinin
AuthorDate: Thu Feb 21 14:02:35 2019 +0700
IGNITE-11327 Web Console: Fixed error on progress line show/hide.
---
.../components/global-progress-line/controller.ts | 24 ++
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git
a/modules/web-console/frontend/app/components/global-progress-line/controller.ts
b/modules/web-console/frontend/app/components/global-progress-line/controller.ts
index ee33b2e..fd8a4bbb 100644
---
a/modules/web-console/frontend/app/components/global-progress-line/controller.ts
+++
b/modules/web-console/frontend/app/components/global-progress-line/controller.ts
@@ -19,21 +19,29 @@ export default class GlobalProgressLine {
/** @type {boolean} */
isLoading;
-static $inject = ['$element', '$document'];
+static $inject = ['$element', '$document', '$scope'];
_child: Element;
-constructor(private $element: JQLite, private $document:
ng.IDocumentService) {}
+constructor(private $element: JQLite, private $document:
ng.IDocumentService, private $scope: ng.IScope) {}
$onChanges() {
-if (this.isLoading === true) {
-this._child =
this.$element[0].querySelector('.global-progress-line__progress-line');
-
this.$document[0].querySelector('web-console-header').appendChild(this._child);
-} else
-this.$element.hide();
+this.$scope.$evalAsync(() => {
+if (this.isLoading) {
+this._child =
this.$element[0].querySelector('.global-progress-line__progress-line');
+
+if (this._child)
+
this.$document[0].querySelector('web-console-header').appendChild(this._child);
+}
+else
+this.$element.hide();
+});
}
$onDestroy() {
-if (this._child) this._child.parentElement.removeChild(this._child);
+if (this._child) {
+this._child.parentElement.removeChild(this._child);
+this._child = null;
+}
}
}
[ignite] branch master updated: IGNITE-11353 Web console: Fixed redirect to signin page from with status "403" page.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new cc36b88 IGNITE-11353 Web console: Fixed redirect to signin page from
with status "403" page.
cc36b88 is described below
commit cc36b8818c10d60bba2b6db14f3e96c3db7e5610
Author: Ilya Borisov
AuthorDate: Wed Feb 20 10:02:29 2019 +0700
IGNITE-11353 Web console: Fixed redirect to signin page from with status
"403" page.
---
.../app/components/timed-redirection/controller.ts | 16
.../web-console/frontend/app/modules/user/user.module.js | 2 +-
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git
a/modules/web-console/frontend/app/components/timed-redirection/controller.ts
b/modules/web-console/frontend/app/components/timed-redirection/controller.ts
index 034ff3c..c8fa892 100644
---
a/modules/web-console/frontend/app/components/timed-redirection/controller.ts
+++
b/modules/web-console/frontend/app/components/timed-redirection/controller.ts
@@ -17,6 +17,7 @@
import {StateOrName, StateService} from '@uirouter/angularjs';
import {RawParams} from '@uirouter/core/lib/params/interface';
+import {default as UserFactory} from 'app/modules/user/User.service';
interface State {
name: StateOrName,
@@ -24,7 +25,7 @@ interface State {
}
export class TimedRedirectionCtrl implements ng.IComponentController,
ng.IOnInit, ng.IOnDestroy {
-static $inject = ['$state', '$interval'];
+static $inject = ['$state', '$interval', 'User'];
lastSuccessState =
JSON.parse(localStorage.getItem('lastStateChangeSuccess'));
@@ -34,7 +35,7 @@ export class TimedRedirectionCtrl implements
ng.IComponentController, ng.IOnInit
countDown: ng.IPromise;
-constructor(private $state: StateService, private $interval:
ng.IIntervalService) {}
+constructor(private $state: StateService, private $interval:
ng.IIntervalService, private user: ReturnType) {}
$onInit() {
this.startCountDown();
@@ -44,8 +45,15 @@ export class TimedRedirectionCtrl implements
ng.IComponentController, ng.IOnInit
this.$interval.cancel(this.countDown);
}
-go(): void {
-this.$state.go(this.stateToGo.name, this.stateToGo.params);
+async go(): void {
+try {
+await this.user.load();
+
+this.$state.go(this.stateToGo.name, this.stateToGo.params);
+}
+catch (ignored) {
+this.$state.go('signin');
+}
}
startCountDown(): void {
diff --git a/modules/web-console/frontend/app/modules/user/user.module.js
b/modules/web-console/frontend/app/modules/user/user.module.js
index c78cc8c..370d470 100644
--- a/modules/web-console/frontend/app/modules/user/user.module.js
+++ b/modules/web-console/frontend/app/modules/user/user.module.js
@@ -88,7 +88,7 @@ function run($root, $transitions, AclService, User,
Activities) {
throw new Error('Illegal access error');
})
.catch(() => {
-return $state.target(trans.to().failState || '403');
+return $state.target(trans.to().failState || 'base.403');
});
});
}
[ignite] branch master updated: IGNITE-11098 Web Console: Set font in a single place. Use inherited font everywhere.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 11e2d3c IGNITE-11098 Web Console: Set font in a single place. Use
inherited font everywhere.
11e2d3c is described below
commit 11e2d3cc659a7f98501d3ffb722454316ad4cc01
Author: Ilya Borisov
AuthorDate: Mon Feb 18 13:19:23 2019 +0700
IGNITE-11098 Web Console: Set font in a single place. Use inherited font
everywhere.
---
.../frontend/app/browserUpdate/style.scss | 2 +-
.../frontend/app/components/breadcrumbs/style.scss | 1 -
.../app/components/bs-select-menu/style.scss | 1 -
.../app/components/cluster-selector/style.scss | 1 -
.../list-editable-add-item-button/style.scss | 1 -
.../app/components/page-landing/style.scss | 1 -
.../components/ignite-information/information.scss | 2 --
.../app/components/panel-collapsible/style.scss| 1 -
.../permanent-notifications/template.pug | 2 +-
.../frontend/app/components/ui-grid/style.scss | 1 -
.../app/components/web-console-header/style.scss | 1 -
.../components/modal-preview-project/style.scss| 1 +
.../components/page-configure-advanced/style.scss | 38 +-
.../frontend/app/primitives/badge/index.scss | 1 -
.../frontend/app/primitives/btn/index.scss | 1 -
.../frontend/app/primitives/form-field/index.scss | 1 -
.../frontend/app/primitives/modal/index.scss | 3 --
.../frontend/app/primitives/page/index.scss| 1 -
.../frontend/app/primitives/panel/index.scss | 2 --
.../frontend/app/primitives/table/index.scss | 1 -
.../frontend/app/primitives/tabs/index.scss| 1 -
.../frontend/app/primitives/tooltip/index.scss | 2 --
.../app/primitives/ui-grid-settings/index.scss | 1 -
.../frontend/app/primitives/ui-grid/index.scss | 1 -
.../public/stylesheets/_bootstrap-variables.scss | 4 +--
.../frontend/public/stylesheets/style.scss | 8 +++--
modules/web-console/frontend/views/index.pug | 2 --
27 files changed, 11 insertions(+), 71 deletions(-)
diff --git a/modules/web-console/frontend/app/browserUpdate/style.scss
b/modules/web-console/frontend/app/browserUpdate/style.scss
index 5842f5f..060fb20 100644
--- a/modules/web-console/frontend/app/browserUpdate/style.scss
+++ b/modules/web-console/frontend/app/browserUpdate/style.scss
@@ -20,7 +20,7 @@
#buorg.buorg {
background-color: $brand-warning;
line-height: 16px;
-font-family: Roboto, sans-serif;
+font-family: inherit;
a {
@extend .btn-ignite;
diff --git a/modules/web-console/frontend/app/components/breadcrumbs/style.scss
b/modules/web-console/frontend/app/components/breadcrumbs/style.scss
index b9b08b7..f0a98ee 100644
--- a/modules/web-console/frontend/app/components/breadcrumbs/style.scss
+++ b/modules/web-console/frontend/app/components/breadcrumbs/style.scss
@@ -27,7 +27,6 @@ breadcrumbs {
height: 26px;
border-radius: 4px;
background-color: rgba(197, 197, 197, 0.1);
-font-family: Roboto, sans-serif;
font-size: 12px;
line-height: 1.08;
text-align: left;
diff --git
a/modules/web-console/frontend/app/components/bs-select-menu/style.scss
b/modules/web-console/frontend/app/components/bs-select-menu/style.scss
index ac3f7aa..4997a6d 100644
--- a/modules/web-console/frontend/app/components/bs-select-menu/style.scss
+++ b/modules/web-console/frontend/app/components/bs-select-menu/style.scss
@@ -26,7 +26,6 @@
margin: 0;
list-style: none;
position: absolute;
-font-family: Roboto;
outline: none !important;
overflow-y: auto;
overflow-x: hidden;
diff --git
a/modules/web-console/frontend/app/components/cluster-selector/style.scss
b/modules/web-console/frontend/app/components/cluster-selector/style.scss
index 069dd64..a143d91 100644
--- a/modules/web-console/frontend/app/components/cluster-selector/style.scss
+++ b/modules/web-console/frontend/app/components/cluster-selector/style.scss
@@ -49,7 +49,6 @@ cluster-selector {
div {
margin: 0 10px 0 20px;
-font-family: Roboto;
font-size: 12px;
}
diff --git
a/modules/web-console/frontend/app/components/list-editable/components/list-editable-add-item-button/style.scss
b/modules/web-console/frontend/app/components/list-editable/components/list-editable-add-item-button/style.scss
index 73306ca..7274e2b 100644
---
a/modules/web-console/frontend/app/components/list-editable/components/list-editable-add-item-button/style.scss
+++
b/modules/web-console/frontend/app/components/list-editable/components/list-editable-add-item-button/style.scss
@@ -17,5 +17,4 @@
list-editable-add-item-button {
font-style: italic;
-font-family: Roboto;
}
\ No newline at end of file
diff --git
a/modules
[ignite] branch master updated: IGNITE-9555 Web Console: Fixed handling of unexpected closed sockets.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 6b63556 IGNITE-9555 Web Console: Fixed handling of unexpected closed
sockets.
6b63556 is described below
commit 6b635567489322ba8bbac293571fa963dc057e2d
Author: Vasiliy Sisko
AuthorDate: Fri Feb 15 10:35:35 2019 +0700
IGNITE-9555 Web Console: Fixed handling of unexpected closed sockets.
---
modules/web-console/backend/app/browsersHandler.js | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/modules/web-console/backend/app/browsersHandler.js
b/modules/web-console/backend/app/browsersHandler.js
index 680e340..919b1f0 100644
--- a/modules/web-console/backend/app/browsersHandler.js
+++ b/modules/web-console/backend/app/browsersHandler.js
@@ -130,7 +130,12 @@ module.exports = {
clusterChanged(account, cluster) {
const socks = this._browserSockets.get(account);
-_.forEach(socks, (sock) => sock.emit('cluster:changed',
cluster));
+_.forEach(socks, (sock) => {
+if (sock)
+sock.emit('cluster:changed', cluster);
+else
+console.log(`Fount closed socket [account=${account},
cluster=${cluster}]`);
+});
}
pushInitialData(sock) {
[ignite] branch master updated: IGNITE-11318 Web Console: Added viewport meta tag for better rendering on mobiles and tablets.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 5e04dfd IGNITE-11318 Web Console: Added viewport meta tag for better
rendering on mobiles and tablets.
5e04dfd is described below
commit 5e04dfdd635e6e188b35ecac9817f86a674ad15e
Author: Ilya Borisov
AuthorDate: Fri Feb 15 09:58:32 2019 +0700
IGNITE-11318 Web Console: Added viewport meta tag for better rendering on
mobiles and tablets.
---
modules/web-console/frontend/views/index.pug | 1 +
1 file changed, 1 insertion(+)
diff --git a/modules/web-console/frontend/views/index.pug
b/modules/web-console/frontend/views/index.pug
index a0c6810..449a1eb 100644
--- a/modules/web-console/frontend/views/index.pug
+++ b/modules/web-console/frontend/views/index.pug
@@ -22,6 +22,7 @@ html
meta(http-equiv='content-type' content='text/html; charset=utf-8')
meta(http-equiv='content-language' content='en')
meta(http-equiv='X-UA-Compatible' content='IE=Edge')
+meta(name='viewport' content='width=device-width,
height=device-height, initial-scale=1.0, minimum-scale=1.0')
title(ng-bind='tfMetaTags.title')
meta(ng-repeat='(key, value) in tfMetaTags.properties'
name='{{::key}}' content='{{::value}}')
[ignite] branch master updated: IGNITE-10538 Web Console: Fixed "no-data" component for "Queries" screen.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 27232fb IGNITE-10538 Web Console: Fixed "no-data" component for
"Queries" screen.
27232fb is described below
commit 27232fb7e9ef14d7298722822071874482908a3b
Author: Alexander Kalinin
AuthorDate: Thu Feb 14 18:22:13 2019 +0700
IGNITE-10538 Web Console: Fixed "no-data" component for "Queries" screen.
---
.../page-queries/components/queries-notebook/controller.ts | 11 ---
.../page-queries/components/queries-notebook/style.scss | 12 +++-
.../components/queries-notebook/template.tpl.pug | 11 ---
3 files changed, 23 insertions(+), 11 deletions(-)
diff --git
a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts
b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts
index 6d17aca..83e9723 100644
---
a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts
+++
b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts
@@ -18,7 +18,7 @@
import _ from 'lodash';
import {nonEmpty, nonNil} from 'app/utils/lodashMixins';
import id8 from 'app/utils/id8';
-import {timer, merge, defer, of} from 'rxjs';
+import {timer, merge, defer, of, EMPTY} from 'rxjs';
import {tap, switchMap, exhaustMap, take, pluck, distinctUntilChanged, filter,
map, catchError} from 'rxjs/operators';
import {CSV} from 'app/services/CSV';
@@ -942,8 +942,13 @@ export class NotebookCtrl {
this.refresh$ = cluster$.pipe(
switchMap((cluster) => {
-if (!cluster && !agentMgr.isDemoMode())
-return of(null);
+if (!cluster && !agentMgr.isDemoMode()) {
+return of(EMPTY).pipe(
+tap(() => {
+$scope.caches = [];
+})
+);
+}
return of(cluster).pipe(
tap(() => Loading.start('sqlLoading')),
diff --git
a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/style.scss
b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/style.scss
index e632cdb..8645316 100644
---
a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/style.scss
+++
b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/style.scss
@@ -107,7 +107,6 @@ queries-notebook {
}
.empty-caches {
-color: $ignite-placeholder-color;
display: flex;
padding: 10px;
align-items: center;
@@ -152,6 +151,17 @@ queries-notebook {
overflow-y: auto;
}
+
+.notebook-failed--block {
+text-align: center;
+display: flex;
+min-height: 200px;
+align-items: center;
+justify-content: center;
+margin-bottom: 30px;
+background: white;
+box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2);
+}
}
.popover.settings.refresh-rate {
diff --git
a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug
b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug
index e7334cb..5342333 100644
---
a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug
+++
b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug
@@ -66,11 +66,6 @@ mixin chart-settings
.col-xs-2
+result-toolbar
-mixin notebook-error
-h2 Failed to load notebook
-label.col-sm-12 Notebook not accessible any more. Go back to notebooks
list.
-button.h3.btn.btn-primary(ui-sref='default-state') Leave Notebook
-
mixin query-settings
div
.form-field--inline(
@@ -496,8 +491,10 @@ div
readonly='true'
)
-div(ng-if='notebookLoadFailed' style='text-align: center')
-+notebook-error
+.notebook-failed--block(ng-if='notebookLoadFailed')
+no-data
+h2 Failed to load notebook
+label.col-sm-12 Notebook not accessible any more. Go back to
notebooks list.
div(ng-if='notebook' ignite-loading='sqlLoading' ignite-loading-text='{{
loadingText }}' ignite-loading-position='top')
.docs-body.paragraphs
[ignite] branch master updated: IGNITE-10965 Web console: Implemented indication for potentially long operation: 1. Disable button after starting potentially long operation. 2. Swap red line under app
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new b0493d8 IGNITE-10965 Web console: Implemented indication for
potentially long operation: 1. Disable button after starting potentially long
operation. 2. Swap red line under app header with 'global-progress-line'
component to indicate running operation.
b0493d8 is described below
commit b0493d8de47de3f4679dbe1d11c79554b1ad41b8
Author: Ilya Borisov
AuthorDate: Fri Feb 8 10:18:33 2019 +0700
IGNITE-10965 Web console: Implemented indication for potentially long
operation:
1. Disable button after starting potentially long operation.
2. Swap red line under app header with 'global-progress-line' component
to indicate running operation.
Co-authored-by: Ilya Borisov
Co-authored-by: Alexander Kalinin
---
modules/web-console/frontend/app/app.js| 4 ++-
.../components/global-progress-line/component.ts | 28
.../components/global-progress-line/controller.ts | 39 ++
.../app/components/global-progress-line/index.ts | 24 +
.../app/components/global-progress-line/style.scss | 25 ++
.../template.pug | 14 +---
.../app/components/page-profile/controller.js | 13 +---
.../app/components/page-profile/template.pug | 4 ++-
.../app/components/page-signin/controller.ts | 10 +-
.../app/components/page-signin/template.pug| 3 ++
.../app/components/page-signup/controller.ts | 23 +
.../app/components/page-signup/template.pug| 3 ++
12 files changed, 163 insertions(+), 27 deletions(-)
diff --git a/modules/web-console/frontend/app/app.js
b/modules/web-console/frontend/app/app.js
index be4dc16..c54a832 100644
--- a/modules/web-console/frontend/app/app.js
+++ b/modules/web-console/frontend/app/app.js
@@ -147,6 +147,7 @@ import sidebar from './components/web-console-sidebar';
import permanentNotifications from './components/permanent-notifications';
import signupConfirmation from './components/page-signup-confirmation';
import noDataCmp from './components/no-data';
+import globalProgressBar from './components/global-progress-line';
import igniteServices from './services';
@@ -249,7 +250,8 @@ export default angular
permanentNotifications.name,
timedRedirection.name,
signupConfirmation.name,
-noDataCmp.name
+noDataCmp.name,
+globalProgressBar.name
])
.service('$exceptionHandler', $exceptionHandler)
// Directives.
diff --git
a/modules/web-console/frontend/app/components/global-progress-line/component.ts
b/modules/web-console/frontend/app/components/global-progress-line/component.ts
new file mode 100644
index 000..508bb93
--- /dev/null
+++
b/modules/web-console/frontend/app/components/global-progress-line/component.ts
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+import controller from './controller';
+import template from './template.pug';
+import './style.scss';
+
+export default {
+template,
+controller,
+bindings: {
+isLoading: '<'
+}
+} as ng.IComponentOptions;
diff --git
a/modules/web-console/frontend/app/components/global-progress-line/controller.ts
b/modules/web-console/frontend/app/components/global-progress-line/controller.ts
new file mode 100644
index 000..ee33b2e
--- /dev/null
+++
b/modules/web-console/frontend/app/components/global-progress-line/controller.ts
@@ -0,0 +1,39 @@
+/*
+ * 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/li
[ignite] branch master updated: IGNITE-11220 Web Console: Fixed NPE in Web Agent in case of using SSL without trust manager. Fixes #6036.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new c3fa299 IGNITE-11220 Web Console: Fixed NPE in Web Agent in case of
using SSL without trust manager. Fixes #6036.
c3fa299 is described below
commit c3fa2996ab03a6cd368ac669095852cb6c7a80f6
Author: Alexey Kuznetsov
AuthorDate: Wed Feb 6 22:40:41 2019 +0700
IGNITE-11220 Web Console: Fixed NPE in Web Agent in case of using SSL
without trust manager. Fixes #6036.
---
.../src/main/java/org/apache/ignite/console/agent/AgentLauncher.java | 5 -
.../main/java/org/apache/ignite/console/agent/rest/RestExecutor.java | 5 -
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git
a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java
index 62c976e..2eddee8 100644
---
a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java
+++
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java
@@ -368,7 +368,10 @@ public class AgentLauncher {
);
if (sslSocketFactory != null) {
-builder.sslSocketFactory(sslSocketFactory, serverTrustMgr);
+if (serverTrustMgr != null)
+builder.sslSocketFactory(sslSocketFactory, serverTrustMgr);
+else
+builder.sslSocketFactory(sslSocketFactory);
if (!F.isEmpty(cipherSuites))
builder.connectionSpecs(sslConnectionSpec(cipherSuites));
diff --git
a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/rest/RestExecutor.java
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/rest/RestExecutor.java
index 374533f..d5f2c1e 100644
---
a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/rest/RestExecutor.java
+++
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/rest/RestExecutor.java
@@ -115,7 +115,10 @@ public class RestExecutor implements AutoCloseable {
);
if (sslSocketFactory != null) {
-builder.sslSocketFactory(sslSocketFactory, trustMgr);
+if (trustMgr != null)
+builder.sslSocketFactory(sslSocketFactory, trustMgr);
+else
+builder.sslSocketFactory(sslSocketFactory);
if (!F.isEmpty(cipherSuites))
builder.connectionSpecs(sslConnectionSpec(cipherSuites));
[ignite] branch master updated: IGNITE-10538 Web Console: Implemented "no-data" component for handling missing Web agent and/or cluster.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 98dc589 IGNITE-10538 Web Console: Implemented "no-data" component for
handling missing Web agent and/or cluster.
98dc589 is described below
commit 98dc58918fffdb7e4f9c13df0a7a6c3150782c6b
Author: Alexander Kalinin
AuthorDate: Wed Feb 6 13:51:18 2019 +0700
IGNITE-10538 Web Console: Implemented "no-data" component for handling
missing Web agent and/or cluster.
---
.../testcafe/components/no-data.js}| 14 +--
modules/web-console/frontend/app/app.js| 32 ++---
.../component.ts} | 29 +++--
.../components/chart-no-data/component.ts} | 25 ++--
.../components/chart-no-data/controller.ts | 80 +
.../components/chart-no-data/index.ts} | 17 +--
.../chart-no-data/template.tpl.pug}| 25 +---
.../frontend/app/components/ignite-chart/index.js | 20 +---
.../{template.pug => template.tpl.pug} | 4 +-
.../component.ts} | 25 ++--
.../no-data/controller.ts} | 57 -
.../information.directive.js => no-data/index.ts} | 19 ++-
.../style.scss}| 20 ++--
.../app/components/no-data/template.tpl.pug| 35 ++
.../ignite-information/information.directive.js| 1 +
.../components/queries-notebook/controller.ts | 53 +---
.../components/queries-notebook/style.scss | 11 ++
.../components/queries-notebook/template.tpl.pug | 6 +-
.../components/modal-import-models/component.js| 133 -
.../components/modal-import-models/service.ts | 3 +-
.../components/modal-import-models/style.scss | 8 ++
.../modal-import-models/template.tpl.pug | 10 +-
.../app/modules/agent/AgentManager.service.js | 57 +
modules/web-console/frontend/app/types/index.ts| 6 +
.../frontend/public/stylesheets/style.scss | 7 --
25 files changed, 386 insertions(+), 311 deletions(-)
diff --git
a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/components/ignite-information/information.directive.js
b/modules/web-console/e2e/testcafe/components/no-data.js
similarity index 77%
copy from
modules/web-console/frontend/app/components/page-queries/components/queries-notebook/components/ignite-information/information.directive.js
copy to modules/web-console/e2e/testcafe/components/no-data.js
index 8e95791..12be3a6 100644
---
a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/components/ignite-information/information.directive.js
+++ b/modules/web-console/e2e/testcafe/components/no-data.js
@@ -15,16 +15,6 @@
* limitations under the License.
*/
-import template from './information.pug';
+import {Selector} from 'testcafe';
-export default function() {
-return {
-scope: {
-title: '@'
-},
-restrict: 'E',
-template,
-replace: true,
-transclude: true
-};
-}
+export const noDataCmp = Selector('no-data');
diff --git a/modules/web-console/frontend/app/app.js
b/modules/web-console/frontend/app/app.js
index 2c42c62..be4dc16 100644
--- a/modules/web-console/frontend/app/app.js
+++ b/modules/web-console/frontend/app/app.js
@@ -146,6 +146,7 @@ import formSignup from './components/form-signup';
import sidebar from './components/web-console-sidebar';
import permanentNotifications from './components/permanent-notifications';
import signupConfirmation from './components/page-signup-confirmation';
+import noDataCmp from './components/no-data';
import igniteServices from './services';
@@ -247,7 +248,8 @@ export default angular
sidebar.name,
permanentNotifications.name,
timedRedirection.name,
-signupConfirmation.name
+signupConfirmation.name,
+noDataCmp.name
])
.service('$exceptionHandler', $exceptionHandler)
// Directives.
@@ -306,11 +308,11 @@ export default angular
// Set up the states.
$stateProvider
-.state('base', {
-url: '',
-abstract: true,
-template: baseTemplate
-});
+.state('base', {
+url: '',
+abstract: true,
+template: baseTemplate
+});
$urlRouterProvider.otherwise('/404');
$locationProvider.html5Mode(true);
@@ -361,17 +363,17 @@ export default angular
localStorage.setItem('lastStateChangeSuccess',
JSON.stringify({name, params}));
}
[ignite] branch master updated: IGNITE-11101 Web console: Fixed scroll to element in Firefox and Safari. Fixes #5957.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 24ff65b IGNITE-11101 Web console: Fixed scroll to element in Firefox
and Safari. Fixes #5957.
24ff65b is described below
commit 24ff65b22cba2591ad68efebd560923aa63de057
Author: Ilya Borisov
AuthorDate: Thu Jan 31 06:50:51 2019 +0700
IGNITE-11101 Web console: Fixed scroll to element in Firefox and Safari.
Fixes #5957.
---
.../form-field/showValidationError.directive.ts | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git
a/modules/web-console/frontend/app/components/form-field/showValidationError.directive.ts
b/modules/web-console/frontend/app/components/form-field/showValidationError.directive.ts
index 0aebe5a..7743f7a 100644
---
a/modules/web-console/frontend/app/components/form-field/showValidationError.directive.ts
+++
b/modules/web-console/frontend/app/components/form-field/showValidationError.directive.ts
@@ -17,6 +17,18 @@
import {IInputErrorNotifier} from '../../types';
+const scrollIntoView = (() => {
+if (HTMLElement.prototype.scrollIntoViewIfNeeded)
+return (el: HTMLElement) => {el.scrollIntoViewIfNeeded();};
+return (el: HTMLElement) => {
+try {
+el.scrollIntoView({block: 'center'});
+} catch (e) {
+el.scrollIntoView();
+}
+};
+})();
+
/**
* Brings user attention to invalid form fields.
* Use IgniteFormUtils.triggerValidation to trigger the event.
@@ -50,10 +62,7 @@ export function directive($timeout) {
}
$timeout(() => {
-if (el[0].scrollIntoViewIfNeeded)
-el[0].scrollIntoViewIfNeeded();
-else
-el[0].scrollIntoView();
+scrollIntoView(el[0]);
if (!attr.bsSelect)
$timeout(() => el[0].focus(), 100);
[ignite] branch master updated: IGNITE-11033 Fixed IllegalStateException in VisorBaselineTask on set new baseline.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 977108a IGNITE-11033 Fixed IllegalStateException in VisorBaselineTask
on set new baseline.
977108a is described below
commit 977108a7566ca56f4001289062a825a8f2a40667
Author: Vasiliy Sisko
AuthorDate: Thu Jan 31 06:38:06 2019 +0700
IGNITE-11033 Fixed IllegalStateException in VisorBaselineTask on set new
baseline.
---
.../ignite/internal/visor/baseline/VisorBaselineTask.java | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
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 93c41ab..61da1a5 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
@@ -26,6 +26,7 @@ import java.util.Map;
import org.apache.ignite.IgniteException;
import org.apache.ignite.cluster.BaselineNode;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.cluster.DetachedClusterNode;
import org.apache.ignite.internal.cluster.IgniteClusterEx;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.processors.task.GridVisorManagementTask;
@@ -134,10 +135,10 @@ public class VisorBaselineTask extends
VisorOneNodeTask baseline = currentBaseLine();
if (F.isEmpty(baseline))
-return set0(Collections.EMPTY_LIST);
+return set0(Collections.emptyList());
for (String consistentId : consistentIds) {
BaselineNode node = baseline.remove(consistentId);
[ignite] branch master updated: IGNITE-11114 Web console: Fixed left navigation menu item hover state color. Fixes #5954.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new f4acd88 IGNITE-4 Web console: Fixed left navigation menu item
hover state color. Fixes #5954.
f4acd88 is described below
commit f4acd8832f0dac3e03ef31cd2b3d3c83968a5fee
Author: Ilya Borisov
AuthorDate: Thu Jan 31 06:13:01 2019 +0700
IGNITE-4 Web console: Fixed left navigation menu item hover state
color. Fixes #5954.
---
.../web-console-sidebar/web-console-sidebar-navigation/style.scss | 4
1 file changed, 4 deletions(-)
diff --git
a/modules/web-console/frontend/app/components/web-console-sidebar/web-console-sidebar-navigation/style.scss
b/modules/web-console/frontend/app/components/web-console-sidebar/web-console-sidebar-navigation/style.scss
index b9c3e68..1b2c4ff 100644
---
a/modules/web-console/frontend/app/components/web-console-sidebar/web-console-sidebar-navigation/style.scss
+++
b/modules/web-console/frontend/app/components/web-console-sidebar/web-console-sidebar-navigation/style.scss
@@ -33,7 +33,6 @@ web-console-sidebar-navigation {
.web-console-sidebar-navigation__link-icon {
width: 20px;
height: auto;
-color: var(--inactive-link-color);
}
.web-console-sidebar-navigation__link-narrow {
@@ -64,9 +63,6 @@ web-console-sidebar-navigation {
position: absolute;
background: var(--active-link-color);
}
-.web-console-sidebar-navigation__link-icon {
-color: inherit;
-}
}
.web-console-sidebar-navigation__link-content {
display: none;
[ignite] branch master updated: IGNITE-8145 Fixed wrong commit.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 273d5f0 IGNITE-8145 Fixed wrong commit.
273d5f0 is described below
commit 273d5f0eed47e58c0266a2c030bac102154a8a9c
Author: Alexey Kuznetsov
AuthorDate: Wed Jan 30 16:27:59 2019 +0700
IGNITE-8145 Fixed wrong commit.
---
modules/platforms/dotnet/Apache.Ignite.ndproj | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/platforms/dotnet/Apache.Ignite.ndproj
b/modules/platforms/dotnet/Apache.Ignite.ndproj
index 6689af7..f30d8ad 100644
--- a/modules/platforms/dotnet/Apache.Ignite.ndproj
+++ b/modules/platforms/dotnet/Apache.Ignite.ndproj
@@ -1795,7 +1795,7 @@ from t in JustMyCode.Types where
where newFields.Count > oldFields.Count
let addedFields = newFields.Where(f => f.WasAdded())
- let rmvFields = oldFields.Where(f => f.WasRemoved())
+ let removedFields = oldFields.Where(f => f.WasRemoved())
orderby addedFields.Count() descending
@@ -1804,7 +1804,7 @@ select new {
nbOldFields = oldFields.Count,
nbNewFields = newFields.Count,
addedFields,
- rmvFields,
+ removedFields,
Debt = (10*addedFields.Count()).ToMinutes().ToDebt(),
AnnualInterest = addedFields.Count().Linear(
[ignite] branch master updated: IGNITE-8145 Web Console: Added test to check difference between Ignite configuration and Web Console "Configuration" screen.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 3f889a3 IGNITE-8145 Web Console: Added test to check difference
between Ignite configuration and Web Console "Configuration" screen.
3f889a3 is described below
commit 3f889a3086de14c79d0dd462aeb4707788548ab7
Author: Vasiliy Sisko
AuthorDate: Wed Jan 30 16:22:09 2019 +0700
IGNITE-8145 Web Console: Added test to check difference between Ignite
configuration and Web Console "Configuration" screen.
---
modules/platforms/dotnet/Apache.Ignite.ndproj | 6 +-
modules/web-console/pom.xml| 29 +
.../console/configuration/FieldProcessingInfo.java | 89 ++
.../ignite/console/configuration/MetadataInfo.java | 69 ++
.../WebConsoleConfigurationSelfTest.java | 979 +
.../ignite/console/configuration/WrongFields.java | 76 ++
.../console/testsuites/WebConsoleTestSuite.java| 32 +
7 files changed, 1277 insertions(+), 3 deletions(-)
diff --git a/modules/platforms/dotnet/Apache.Ignite.ndproj
b/modules/platforms/dotnet/Apache.Ignite.ndproj
index ae99617..6689af7 100644
--- a/modules/platforms/dotnet/Apache.Ignite.ndproj
+++ b/modules/platforms/dotnet/Apache.Ignite.ndproj
@@ -1795,7 +1795,7 @@ from t in JustMyCode.Types where
where newFields.Count > oldFields.Count
let addedFields = newFields.Where(f => f.WasAdded())
- let removedFields = oldFields.Where(f => f.WasRemoved())
+ let rmvFields = oldFields.Where(f => f.WasRemoved())
orderby addedFields.Count() descending
@@ -1804,7 +1804,7 @@ select new {
nbOldFields = oldFields.Count,
nbNewFields = newFields.Count,
addedFields,
- removedFields,
+ rmvFields,
Debt = (10*addedFields.Count()).ToMinutes().ToDebt(),
AnnualInterest = addedFields.Count().Linear(
@@ -11138,4 +11138,4 @@ select new {
-
\ No newline at end of file
+
diff --git a/modules/web-console/pom.xml b/modules/web-console/pom.xml
index 17c5f0b..c72e32d 100644
--- a/modules/web-console/pom.xml
+++ b/modules/web-console/pom.xml
@@ -50,6 +50,35 @@
ignite-web-agent
${project.version}
+
+
+
+org.apache.ignite
+ignite-hadoop
+${project.version}
+test
+
+
+
+org.apache.ignite
+ignite-aws
+${project.version}
+test
+
+
+
+org.apache.ignite
+ignite-hibernate_4.2
+${project.version}
+test
+
+
+
+org.apache.ignite
+ignite-urideploy
+${project.version}
+test
+
diff --git
a/modules/web-console/src/test/java/org/apache/ignite/console/configuration/FieldProcessingInfo.java
b/modules/web-console/src/test/java/org/apache/ignite/console/configuration/FieldProcessingInfo.java
new file mode 100644
index 000..8637c99
--- /dev/null
+++
b/modules/web-console/src/test/java/org/apache/ignite/console/configuration/FieldProcessingInfo.java
@@ -0,0 +1,89 @@
+/*
+ * 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.console.configuration;
+
+/**
+ * Service class with information about property in configuration state.
+ */
+public class FieldProcessingInfo {
+/** Property name. */
+private final String name;
+
+/** Count of occurrence in configuration class. */
+private int occurrence;
+
+/** Deprecated sign of property getter or setter method. */
+private boolean deprecated;
+
+/**
+ * Constructor.
+ *
+ * @param name Property name.
+ * @param occurrence Count of occurrence in configuration class.
+ * @param deprecated Deprecated sign of property getter or setter method.
+ */
+public FieldProcessingInfo(String name, int occurrence, boolean
deprecated) {
+this.name = name;
+this.occurrence = occurrence;
+this.deprecated = de
[ignite] branch master updated: IGNITE-10961 Web console: Added more countries for "Sign up" and "Profile" screens.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new bdeed89 IGNITE-10961 Web console: Added more countries for "Sign up"
and "Profile" screens.
bdeed89 is described below
commit bdeed89377b758321c749043fa4c0c2bb0d5f4eb
Author: Ilya Borisov
AuthorDate: Tue Jan 29 17:11:07 2019 +0700
IGNITE-10961 Web console: Added more countries for "Sign up" and "Profile"
screens.
---
.../e2e/testcafe/environment/envtools.js | 5 +-
.../app/components/form-signup/template.pug| 2 +-
.../app/components/page-profile/template.pug | 4 +-
.../web-console/frontend/app/data/countries.json | 73 +++---
4 files changed, 71 insertions(+), 13 deletions(-)
diff --git a/modules/web-console/e2e/testcafe/environment/envtools.js
b/modules/web-console/e2e/testcafe/environment/envtools.js
index c86a34a..0952951 100644
--- a/modules/web-console/e2e/testcafe/environment/envtools.js
+++ b/modules/web-console/e2e/testcafe/environment/envtools.js
@@ -146,6 +146,7 @@ const exec = (command, onResolveString, cwd, env) => {
const startEnv = (webConsoleRootDirectoryPath = '../../') => {
return new Promise(async(resolve) => {
+const BACKEND_PORT = 3001;
const command = `${process.platform === 'win32' ? 'npm.cmd' : 'npm'}
start`;
let port = 9001;
@@ -153,8 +154,8 @@ const startEnv = (webConsoleRootDirectoryPath = '../../')
=> {
if (process.env.APP_URL)
port = parseInt(url.parse(process.env.APP_URL).port, 10) || 80;
-const backendInstanceLaunch = exec(command, 'Start listening',
`${webConsoleRootDirectoryPath}backend`, {server_port: 3001, mongodb_url:
mongoUrl}); // Todo: refactor cwd for backend when it's linked
-const frontendInstanceLaunch = exec(command, 'Compiled successfully',
`${webConsoleRootDirectoryPath}frontend`, {BACKEND_PORT: 3001, PORT: port});
+const backendInstanceLaunch = exec(command, 'Start listening',
`${webConsoleRootDirectoryPath}backend`, {server_port: BACKEND_PORT,
mongodb_url: mongoUrl});
+const frontendInstanceLaunch = exec(command, 'Compiled successfully',
`${webConsoleRootDirectoryPath}frontend`, {BACKEND_URL:
`http://localhost:${BACKEND_PORT}`, PORT: port});
console.log('Building backend in progress...');
await backendInstanceLaunch;
diff --git
a/modules/web-console/frontend/app/components/form-signup/template.pug
b/modules/web-console/frontend/app/components/form-signup/template.pug
index 375ea95..b9ed948 100644
--- a/modules/web-console/frontend/app/components/form-signup/template.pug
+++ b/modules/web-console/frontend/app/components/form-signup/template.pug
@@ -83,7 +83,7 @@ include /app/helpers/jade/mixins
)
.span-1
+form-field__dropdown({
-label: 'Country:',
+label: 'Country/Region:',
model: '$ctrl.ngModel.$viewValue.country',
name: '"country"',
required: true,
diff --git
a/modules/web-console/frontend/app/components/page-profile/template.pug
b/modules/web-console/frontend/app/components/page-profile/template.pug
index 68c321f..2b2b748 100644
--- a/modules/web-console/frontend/app/components/page-profile/template.pug
+++ b/modules/web-console/frontend/app/components/page-profile/template.pug
@@ -69,11 +69,11 @@ div
)
.col-50
+form-field__dropdown({
-label: 'Country:',
+label: 'Country/Region:',
model: '$ctrl.ui.user.country',
name: '"country"',
required: true,
-placeholder: 'Choose your country',
+placeholder: 'Choose your country/region',
options: '$ctrl.ui.countries'
})
.row
diff --git a/modules/web-console/frontend/app/data/countries.json
b/modules/web-console/frontend/app/data/countries.json
index b340f02..8f274ad 100644
--- a/modules/web-console/frontend/app/data/countries.json
+++ b/modules/web-console/frontend/app/data/countries.json
@@ -65,19 +65,24 @@
"code": "CHN"
},
{
-"label": "India",
-"value": "India",
-"code": "IND"
- },
- {
"label": "Japan",
"value": "Japan",
"code": "JPN"
},
{
-"label": "Other Asia",
-"value": "Other Asia",
-"code": "Other Asia"
+"label": "South Korea",
+"value": "South Korea",
+"code"
[ignite] branch master updated: IGNITE-10489 Web console: Fixed double validation at "Configuration" screen.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 7fecdea IGNITE-10489 Web console: Fixed double validation at
"Configuration" screen.
7fecdea is described below
commit 7fecdeae5fd276285496b8109f9431f002ef977f
Author: Ilya Borisov
AuthorDate: Tue Jan 29 14:52:12 2019 +0700
IGNITE-10489 Web console: Fixed double validation at "Configuration" screen.
---
.../{controller.js => controller.ts} | 59 +-
...rective.js => showValidationError.directive.ts} | 4 +-
.../{pcValidation.js => pcValidation.ts} | 26 ++
.../frontend/app/primitives/form-field/index.scss | 1 +
modules/web-console/frontend/app/types/index.ts| 5 ++
5 files changed, 49 insertions(+), 46 deletions(-)
diff --git
a/modules/web-console/frontend/app/components/form-field/components/form-field-size/controller.js
b/modules/web-console/frontend/app/components/form-field/components/form-field-size/controller.ts
similarity index 80%
rename from
modules/web-console/frontend/app/components/form-field/components/form-field-size/controller.js
rename to
modules/web-console/frontend/app/components/form-field/components/form-field-size/controller.ts
index e158c0a..84e3cde 100644
---
a/modules/web-console/frontend/app/components/form-field/components/form-field-size/controller.js
+++
b/modules/web-console/frontend/app/components/form-field/components/form-field-size/controller.ts
@@ -16,25 +16,24 @@
*/
import get from 'lodash/get';
-
-export default class PCFormFieldSizeController {
-/** @type {ng.INgModelController} */
-ngModel;
-/** @type {number} */
-min;
-/** @type {number} */
-max;
-/** @type {ng.ICompiledExpression} */
-onScaleChange;
-/** @type {ng.IFormController} */
-innerForm;
-/** @type {boolean?} */
-autofocus;
+import {IInputErrorNotifier} from '../../../../types';
+
+export default class PCFormFieldSizeController implements IInputErrorNotifier {
+ngModel: ng.INgModelController;
+min?: number;
+max?: number;
+onScaleChange: ng.ICompiledExpression;
+innerForm: ng.IFormController;
+inputElement?: HTMLInputElement;
+autofocus?: boolean;
+id = Math.random();
+sizesMenu?: ig.config.formFieldSize.ISizeTypes[keyof
ig.config.formFieldSize.ISizeTypes];
+private _sizeScale: ig.config.formFieldSize.ISizeTypeOption;
+value: number;
static $inject = ['$element', '$attrs'];
-/** @type {ig.config.formFieldSize.ISizeTypes} */
-static sizeTypes = {
+static sizeTypes: ig.config.formFieldSize.ISizeTypes = {
bytes: [
{label: 'Kb', value: 1024},
{label: 'Mb', value: 1024 * 1024},
@@ -56,15 +55,7 @@ export default class PCFormFieldSizeController {
]
};
-/**
- * @param {JQLite} $element
- * @param {ng.IAttributes} $attrs
- */
-constructor($element, $attrs) {
-this.$element = $element;
-this.$attrs = $attrs;
-this.id = Math.random();
-}
+constructor(private $element: JQLite, private $attrs: ng.IAttributes) {}
$onDestroy() {
delete this.$element[0].focus;
@@ -101,10 +92,7 @@ export default class PCFormFieldSizeController {
if ('min' in changes) this.ngModel.$validate();
}
-/**
- * @param {ig.config.formFieldSize.ISizeTypeOption} value
- */
-set sizeScale(value) {
+set sizeScale(value: ig.config.formFieldSize.ISizeTypeOption) {
this._sizeScale = value;
if (this.onScaleChange) this.onScaleChange({$event: this.sizeScale});
if (this.ngModel) this.assignValue(this.ngModel.$viewValue);
@@ -114,10 +102,7 @@ export default class PCFormFieldSizeController {
return this._sizeScale;
}
-/**
- * @param {number} rawValue
- */
-assignValue(rawValue) {
+assignValue(rawValue: number) {
if (!this.sizesMenu) this.setDefaultSizeType();
return this.value = rawValue
? rawValue / this.sizeScale.value
@@ -147,13 +132,17 @@ export default class PCFormFieldSizeController {
this.sizeScale = this.chooseSizeScale();
}
+isTooltipValidation(): boolean {
+return
!this.$element.parents('.theme--ignite-errors-horizontal').length;
+}
+
notifyAboutError() {
-if (this.$element)
+if (this.$element && this.isTooltipValidation())
this.$element.find('.form-field__error
[bs-tooltip]').trigger('mouseenter');
}
hideError() {
-if (this.$element)
+if (this.$element && this.isTooltipValidation())
this.$element.find('.form-field__error
[bs-tooltip]').trigger('mouseleave');
}
diff --git
a/modules/w
[ignite] branch master updated: IGNITE-10993 Web Console: Implemented queries cancellation. This closes #5869.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 5861a92 IGNITE-10993 Web Console: Implemented queries cancellation.
This closes #5869.
5861a92 is described below
commit 5861a9248fc66013cba960e96de3bbaac4106776
Author: Vasiliy Sisko
AuthorDate: Tue Jan 22 18:09:53 2019 +0700
IGNITE-10993 Web Console: Implemented queries cancellation. This closes
#5869.
---
.../visor/node/VisorNodeBaselineStatus.java| 2 +
.../visor/query/VisorQueryCleanupTask.java | 22 +-
.../internal/visor/query/VisorQueryCursor.java | 95 ---
.../visor/query/VisorQueryFetchFirstPageTask.java | 107
.../internal/visor/query/VisorQueryHolder.java | 171
.../visor/query/VisorQueryNextPageTask.java| 73 +
.../internal/visor/query/VisorQueryTask.java | 83 +-
.../internal/visor/query/VisorQueryUtils.java | 301 +++--
.../internal/visor/query/VisorScanQueryTask.java | 112 +---
.../commands/cache/VisorCacheScanCommand.scala | 24 +-
modules/web-console/backend/app/browsersHandler.js | 2 +
.../components/queries-notebook/controller.ts | 229 ++--
.../components/queries-notebook/template.tpl.pug | 6 +
.../app/modules/agent/AgentManager.service.js | 107
14 files changed, 892 insertions(+), 442 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeBaselineStatus.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeBaselineStatus.java
index ea90be3..a273ca9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeBaselineStatus.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeBaselineStatus.java
@@ -25,8 +25,10 @@ import org.jetbrains.annotations.Nullable;
public enum VisorNodeBaselineStatus {
/** */
NODE_IN_BASELINE,
+
/** */
NODE_NOT_IN_BASELINE,
+
/** */
BASELINE_NOT_AVAILABLE;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
index 9dfa0cf..e62393a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import java.util.concurrent.ConcurrentMap;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.compute.ComputeJob;
import org.apache.ignite.internal.processors.task.GridInternal;
@@ -34,6 +33,8 @@ import org.apache.ignite.internal.visor.VisorTaskArgument;
import org.apache.ignite.internal.visor.util.VisorClusterGroupEmptyException;
import org.jetbrains.annotations.Nullable;
+import static
org.apache.ignite.internal.visor.query.VisorQueryUtils.removeQueryHolder;
+import static org.apache.ignite.internal.visor.util.VisorTaskUtils.log;
import static org.apache.ignite.internal.visor.util.VisorTaskUtils.logMapped;
/**
@@ -106,14 +107,21 @@ public class VisorQueryCleanupTask extends
VisorMultiNodeTask qryIds) {
-ConcurrentMap storage =
ignite.cluster().nodeLocalMap();
+long start = U.currentTimeMillis();
+
+if (debug) {
+start = log(
+ignite.log(),
+"Queries cancellation started: [" + String.join(", ",
qryIds) + "]",
+getClass(),
+start);
+}
-for (String qryId : qryIds) {
-VisorQueryCursor cur = storage.remove(qryId);
+for (String qryId : qryIds)
+removeQueryHolder(ignite, qryId);
-if (cur != null)
-cur.close();
-}
+if (debug)
+log(ignite.log(), "Queries cancellation finished", getClass(),
start);
return null;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursor.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursor.java
deleted file mode 100644
index 3d5c58d..000
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCursor.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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 Y
[ignite] branch master updated: IGNITE-11018 Fixed NPE.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 7eb3ef8 IGNITE-11018 Fixed NPE.
7eb3ef8 is described below
commit 7eb3ef8b6a8e017a11427a52d261ad44e4c8ee12
Author: Vasiliy Sisko
AuthorDate: Tue Jan 22 17:08:54 2019 +0700
IGNITE-11018 Fixed NPE.
---
.../internal/visor/node/VisorCacheRebalanceCollectorTask.java | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheRebalanceCollectorTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheRebalanceCollectorTask.java
index 9d0e041..4ed373b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheRebalanceCollectorTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheRebalanceCollectorTask.java
@@ -173,9 +173,13 @@ public class VisorCacheRebalanceCollectorTask extends
VisorMultiNodeTask baseline =
cluster.currentBaselineTopology();
-boolean inBaseline = baseline.stream().anyMatch(n ->
consistentId.equals(n.consistentId()));
+if (baseline != null) {
+boolean inBaseline = baseline.stream().anyMatch(n ->
consistentId.equals(n.consistentId()));
-res.setBaseline(inBaseline ? NODE_IN_BASELINE :
NODE_NOT_IN_BASELINE);
+res.setBaseline(inBaseline ? NODE_IN_BASELINE :
NODE_NOT_IN_BASELINE);
+}
+else
+res.setBaseline(BASELINE_NOT_AVAILABLE);
}
else
res.setBaseline(BASELINE_NOT_AVAILABLE);
[ignite] branch master updated: IGNITE-9845 Web Agent: Fixed NPE in case of "-Dtrust.all=true" and not configured server trust store.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 0a16208 IGNITE-9845 Web Agent: Fixed NPE in case of
"-Dtrust.all=true" and not configured server trust store.
0a16208 is described below
commit 0a16208a87d4044391de7f2ce8fd497c9cd817b5
Author: Alexey Kuznetsov
AuthorDate: Wed Jan 16 18:43:28 2019 +0700
IGNITE-9845 Web Agent: Fixed NPE in case of "-Dtrust.all=true" and not
configured server trust store.
---
.../apache/ignite/console/agent/AgentLauncher.java | 23 --
.../ignite/console/agent/rest/RestExecutor.java| 4 +++-
.../console/agent/rest/RestExecutorSelfTest.java | 7 ---
3 files changed, 20 insertions(+), 14 deletions(-)
diff --git
a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java
index 9553aac..74c8376 100644
---
a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java
+++
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java
@@ -318,22 +318,24 @@ public class AgentLauncher {
return;
}
-boolean trustAll = Boolean.getBoolean("trust.all");
+boolean serverTrustAll = Boolean.getBoolean("trust.all");
boolean hasServerTrustStore = cfg.serverTrustStore() != null;
-boolean hasNodeTrustStore = cfg.nodeTrustStore() != null;
-if (trustAll && hasServerTrustStore) {
+if (serverTrustAll && hasServerTrustStore) {
log.warn("Options contains both '--server-trust-store' and
'-Dtrust.all=true'. " +
-"Option '-Dtrust.all=true' will be ignored.");
+"Option '-Dtrust.all=true' will be ignored on connect to Web
server.");
-trustAll = false;
+serverTrustAll = false;
}
-if (trustAll && hasNodeTrustStore) {
+boolean nodeTrustAll = Boolean.getBoolean("trust.all");
+boolean hasNodeTrustStore = cfg.nodeTrustStore() != null;
+
+if (nodeTrustAll && hasNodeTrustStore) {
log.warn("Options contains both '--node-trust-store' and
'-Dtrust.all=true'. " +
-"Option '-Dtrust.all=true' will be ignored.");
+"Option '-Dtrust.all=true' will be ignored on connect to
cluster.");
-trustAll = false;
+nodeTrustAll = false;
}
cfg.nodeURIs(nodeURIs);
@@ -344,14 +346,14 @@ public class AgentLauncher {
List cipherSuites = cfg.cipherSuites();
if (
-trustAll ||
+serverTrustAll ||
hasServerTrustStore ||
cfg.serverKeyStore() != null
) {
OkHttpClient.Builder builder = new OkHttpClient.Builder();
X509TrustManager serverTrustMgr = trustManager(
-trustAll,
+serverTrustAll,
cfg.serverTrustStore(),
cfg.serverTrustStorePassword()
);
@@ -381,6 +383,7 @@ public class AgentLauncher {
try (
RestExecutor restExecutor = new RestExecutor(
+nodeTrustAll,
cfg.nodeKeyStore(), cfg.nodeKeyStorePassword(),
cfg.nodeTrustStore(), cfg.nodeTrustStorePassword(),
cipherSuites);
diff --git
a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/rest/RestExecutor.java
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/rest/RestExecutor.java
index b452b2c..5a9783c 100644
---
a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/rest/RestExecutor.java
+++
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/rest/RestExecutor.java
@@ -77,6 +77,7 @@ public class RestExecutor implements AutoCloseable {
/**
* Constructor.
*
+ * @param trustAll {@code true} If we trust to self-signed sertificates.
* @param keyStorePath Optional path to key store file.
* @param keyStorePwd Optional password for key store.
* @param trustStorePath Optional path to trust store file.
@@ -86,6 +87,7 @@ public class RestExecutor implements AutoCloseable {
* @throws IOException If failed to load content of key stores.
*/
public RestExecutor(
+boolean trustAll,
String keyStorePath,
String keyStorePwd,
String trustStorePath,
@@ -101,7 +103,7 @@ public class RestExecutor implements AutoCloseable {
.readTimeout(0, TimeUnit.MILLISECONDS)
[ignite] branch master updated: IGNITE-10936 Web Console: Added support for single select mode on ui-grid.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 9a614e7 IGNITE-10936 Web Console: Added support for single select
mode on ui-grid.
9a614e7 is described below
commit 9a614e7b9884a7cd27233ea46d98cb0b8f04fdba
Author: Vasiliy Sisko
AuthorDate: Tue Jan 15 09:58:09 2019 +0700
IGNITE-10936 Web Console: Added support for single select mode on ui-grid.
---
modules/web-console/frontend/app/components/ui-grid/component.js | 1 +
modules/web-console/frontend/app/components/ui-grid/controller.js | 8
2 files changed, 9 insertions(+)
diff --git a/modules/web-console/frontend/app/components/ui-grid/component.js
b/modules/web-console/frontend/app/components/ui-grid/component.js
index d75cc6c..11ce4d7 100644
--- a/modules/web-console/frontend/app/components/ui-grid/component.js
+++ b/modules/web-console/frontend/app/components/ui-grid/component.js
@@ -36,6 +36,7 @@ export default {
items: '<',
columnDefs: '<',
categories: '
[ignite] branch master updated: Minor cleanup.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 74aa337 Minor cleanup.
74aa337 is described below
commit 74aa3376a40030888f7fd8c57e018c60857ef046
Author: Alexey Kuznetsov
AuthorDate: Mon Jan 14 18:40:36 2019 +0700
Minor cleanup.
---
modules/web-console/backend/app/configure.js | 4
modules/web-console/backend/package.json | 1 +
modules/web-console/backend/routes/profile.js | 2 +-
modules/web-console/backend/services/users.js | 9 +
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/modules/web-console/backend/app/configure.js
b/modules/web-console/backend/app/configure.js
index a0e5190..ac71b74 100644
--- a/modules/web-console/backend/app/configure.js
+++ b/modules/web-console/backend/app/configure.js
@@ -25,6 +25,7 @@ const session = require('express-session');
const connectMongo = require('connect-mongo');
const passport = require('passport');
const passportSocketIo = require('passport.socketio');
+const mongoSanitize = require('express-mongo-sanitize');
// Fire me up!
@@ -50,6 +51,9 @@ module.exports.factory = function(settings, mongo, apis) {
app.use(bodyParser.json({limit: '50mb'}));
app.use(bodyParser.urlencoded({limit: '50mb', extended: true}));
+
+app.use(mongoSanitize({replaceWith: '_'}));
+
app.use(session({
secret: settings.sessionSecret,
resave: false,
diff --git a/modules/web-console/backend/package.json
b/modules/web-console/backend/package.json
index 4399ae7..9d1918e 100644
--- a/modules/web-console/backend/package.json
+++ b/modules/web-console/backend/package.json
@@ -52,6 +52,7 @@
"connect-mongo": "1.3.2",
"cookie-parser": "1.4.3",
"express": "4.15.3",
+"express-mongo-sanitize": "1.3.2",
"express-session": "1.15.4",
"fire-up": "1.0.0",
"glob": "7.1.2",
diff --git a/modules/web-console/backend/routes/profile.js
b/modules/web-console/backend/routes/profile.js
index 0ce2656..79fb3de 100644
--- a/modules/web-console/backend/routes/profile.js
+++ b/modules/web-console/backend/routes/profile.js
@@ -43,7 +43,7 @@ module.exports.factory = function(mongo, usersService) {
if (req.body.password && _.isEmpty(req.body.password))
return res.status(500).send('Wrong value for new password!');
-usersService.save(req.body)
+usersService.save(req.user._id, req.body)
.then((user) => {
const becomeUsed = req.session.viewedUser &&
req.user.admin;
diff --git a/modules/web-console/backend/services/users.js
b/modules/web-console/backend/services/users.js
index ed844db..ecfdc0b 100644
--- a/modules/web-console/backend/services/users.js
+++ b/modules/web-console/backend/services/users.js
@@ -76,7 +76,7 @@ module.exports.factory = (errors, settings, mongo,
spacesService, mailsService,
})
.then((registered) => {
return mongo.Space.create({name: 'Personal space', owner:
registered._id})
-.then(() => registered)
+.then(() => registered);
})
.then((registered) => {
if (settings.activation.enabled) {
@@ -102,16 +102,17 @@ module.exports.factory = (errors, settings, mongo,
spacesService, mailsService,
/**
* Save user.
*
- * @param {Object} changed - The user
+ * @param userId User ID.
+ * @param {Object} changed Changed user.
* @returns {Promise.} that resolves account id of
merge operation.
*/
-static save(changed) {
+static save(userId, changed) {
delete changed.admin;
delete changed.activated;
delete changed.activationSentAt;
delete changed.activationToken;
-return mongo.Account.findById(changed._id).exec()
+return mongo.Account.findById(userId).exec()
.then((user) => {
if (!changed.password)
return Promise.resolve(user);
[ignite] branch master updated: IGNITE-8518 Web Console: Fixed issue with auto focus.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 5bb41d8 IGNITE-8518 Web Console: Fixed issue with auto focus.
5bb41d8 is described below
commit 5bb41d8745c2f71291227fd0ead1eef0b2de031c
Author: Vasiliy Sisko
AuthorDate: Mon Jan 14 18:18:56 2019 +0700
IGNITE-8518 Web Console: Fixed issue with auto focus.
---
.../frontend/app/components/form-field/showValidationError.directive.js | 2 +-
.../components/page-queries/components/queries-notebook/controller.ts | 2 +-
modules/web-console/frontend/app/directives/auto-focus.directive.js | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
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 31a8f2d..7560b90 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
@@ -54,7 +54,7 @@ export function directive($timeout) {
el[0].scrollIntoView();
if (!attr.bsSelect)
-$timeout(() => el[0].focus());
+$timeout(() => el[0].focus(), 100);
formFieldController &&
formFieldController.notifyAboutError();
});
diff --git
a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts
b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts
index 78274e6..d841cb5 100644
---
a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts
+++
b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts
@@ -1817,7 +1817,7 @@ export class NotebookCtrl {
$scope.dblclickMetadata = function(paragraph, node) {
paragraph.ace.insert(node.name);
-setTimeout(() => paragraph.ace.focus(), 1);
+setTimeout(() => paragraph.ace.focus(), 100);
};
$scope.importMetadata = function() {
diff --git
a/modules/web-console/frontend/app/directives/auto-focus.directive.js
b/modules/web-console/frontend/app/directives/auto-focus.directive.js
index 8d269ce..e67b50d 100644
--- a/modules/web-console/frontend/app/directives/auto-focus.directive.js
+++ b/modules/web-console/frontend/app/directives/auto-focus.directive.js
@@ -27,7 +27,7 @@ export default function directive($timeout) {
* @param {JQLite} element
*/
link(scope, element) {
-$timeout(() => element[0].focus());
+$timeout(() => element[0].focus(), 100);
}
};
}
[ignite] branch master updated: IGNITE-10916 Added guard for cache restarting in progress for Visor tasks.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new e05387f IGNITE-10916 Added guard for cache restarting in progress for
Visor tasks.
e05387f is described below
commit e05387f99f878fac758fa4cbf2fb8f6fdba56176
Author: Vasiliy Sisko
AuthorDate: Mon Jan 14 14:30:02 2019 +0700
IGNITE-10916 Added guard for cache restarting in progress for Visor tasks.
---
.../visor/cache/VisorCacheConfigurationCollectorJob.java | 3 ++-
.../visor/cache/VisorCacheMetricsCollectorTask.java | 15 +--
.../internal/visor/cache/VisorCachePartitionsTask.java| 5 +++--
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorJob.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorJob.java
index 9cf2c89..51477c9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorJob.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorJob.java
@@ -26,6 +26,7 @@ import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.util.VisorTaskUtils;
import org.apache.ignite.lang.IgniteUuid;
/**
@@ -63,7 +64,7 @@ public class VisorCacheConfigurationCollectorJob
boolean matched = hasPtrn ? ptrn.matcher(cacheName).find() : all
|| arg.getCacheNames().contains(cacheName);
-if (matched) {
+if (!VisorTaskUtils.isRestartingCache(ignite, cacheName) &&
matched) {
VisorCacheConfiguration cfg =
config(cache.getConfiguration(CacheConfiguration.class),
cache.context().dynamicDeploymentId());
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
index ab1fa8c..4c18ba3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
@@ -30,6 +30,7 @@ import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.visor.VisorJob;
import org.apache.ignite.internal.visor.VisorMultiNodeTask;
+import org.apache.ignite.internal.visor.util.VisorTaskUtils;
import org.jetbrains.annotations.Nullable;
/**
@@ -110,15 +111,17 @@ public class VisorCacheMetricsCollectorTask extends
VisorMultiNodeTask
[ignite] branch master updated: IGNITE-10076 Web Console: Use slow 'json-bigint' parser only for queries.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 9ba0052 IGNITE-10076 Web Console: Use slow 'json-bigint' parser only
for queries.
9ba0052 is described below
commit 9ba0052e4b8b793ff9d2093293e33eaf1f206fca
Author: Alexey Kuznetsov
AuthorDate: Fri Jan 11 17:38:55 2019 +0700
IGNITE-10076 Web Console: Use slow 'json-bigint' parser only for queries.
---
.../frontend/app/modules/agent/AgentManager.service.js | 9 +++--
.../web-console/frontend/app/modules/agent/decompress.worker.js | 6 --
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git
a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
index 0c0d9b6..faf0672 100644
--- a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
+++ b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
@@ -487,8 +487,13 @@ export default class AgentManager {
if (cluster.secured)
this.clustersSecrets.get(cluster.id).sessionToken
= res.sessionToken;
-if (res.zipped)
-return this.pool.postMessage(res.data);
+if (res.zipped) {
+const taskId = _.get(params, 'taskId', '');
+
+const useBigIntJson = taskId.startsWith('query');
+
+return this.pool.postMessage({payload: res.data,
useBigIntJson});
+}
return res;
diff --git
a/modules/web-console/frontend/app/modules/agent/decompress.worker.js
b/modules/web-console/frontend/app/modules/agent/decompress.worker.js
index 2fd294d..deffca3 100644
--- a/modules/web-console/frontend/app/modules/agent/decompress.worker.js
+++ b/modules/web-console/frontend/app/modules/agent/decompress.worker.js
@@ -24,11 +24,13 @@ import bigIntJSON from 'json-bigint';
onmessage = function(e) {
const data = e.data;
-const binaryString = atob(data); // Decode from BASE64
+const binaryString = atob(data.payload); // Decode from BASE64
const unzipped = pako.inflate(binaryString, {to: 'string'});
-const res = bigIntJSON({storeAsString: true}).parse(unzipped);
+const res = data.useBigIntJson
+? bigIntJSON({storeAsString: true}).parse(unzipped)
+: JSON.parse(unzipped);
postMessage(_.get(res, 'result', res));
};
[ignite] branch master updated: IGNITE-10613 Web console: Fixed opening of "Import models" dialog after cancel of "Unsaved changes" confirmation dialog.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new e2cdfae IGNITE-10613 Web console: Fixed opening of "Import models"
dialog after cancel of "Unsaved changes" confirmation dialog.
e2cdfae is described below
commit e2cdfae5313e222144f8f16448ab06f746ad2fd0
Author: Vasiliy Sisko
AuthorDate: Fri Jan 11 15:56:50 2019 +0700
IGNITE-10613 Web console: Fixed opening of "Import models" dialog after
cancel of "Unsaved changes" confirmation dialog.
---
.../page-configure/components/modal-import-models/service.js| 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/service.js
b/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/service.js
index c45abaa..a76ec13 100644
---
a/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/service.js
+++
b/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/service.js
@@ -48,7 +48,11 @@ export default class ModalImportModels {
}
});
-return this.$uiRouter.stateService.go(this._state,
this.$uiRouter.stateService.params);
+return this.$uiRouter.stateService.go(this._state,
this.$uiRouter.stateService.params)
+.catch(() => {
+this.deferred.reject(false);
+this.deferred = null;
+});
}
_open() {
[ignite] branch master updated: IGNITE-10875 Web Console: Updated tooltip.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 47683e7 IGNITE-10875 Web Console: Updated tooltip.
47683e7 is described below
commit 47683e72cb1c33db011fbd754bc04ab85cba3107
Author: Alexey Kuznetsov
AuthorDate: Thu Jan 10 11:22:27 2019 +0700
IGNITE-10875 Web Console: Updated tooltip.
---
.../web-console/frontend/app/components/page-configure/template.pug | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/modules/web-console/frontend/app/components/page-configure/template.pug
b/modules/web-console/frontend/app/components/page-configure/template.pug
index 86180fa..e161ba5 100644
--- a/modules/web-console/frontend/app/components/page-configure/template.pug
+++ b/modules/web-console/frontend/app/components/page-configure/template.pug
@@ -32,7 +32,7 @@ div.pc-content-container
svg.icon-left(
ignite-icon='info'
bs-tooltip=''
-data-title='This setting is needed to hide and show tooltips with
hints.'
+data-title='Use this setting to hide or show tooltips with hints.'
data-placement='left'
)
span Tooltips
@@ -46,4 +46,4 @@ div.pc-content-container
ng-class=`{
'pc-hide-tooltips': !$ctrl.tooltipsVisible
}`
-)
\ No newline at end of file
+)
ignite git commit: IGNITE-9845 Web Agent: 1. Fixed NPE in disabled trust manager. 2. Renamed short options, added description to README.txt, added new options in generated "default.properties".
Repository: ignite
Updated Branches:
refs/heads/master 94fce9743 -> 6ffaba550
IGNITE-9845 Web Agent:
1. Fixed NPE in disabled trust manager.
2. Renamed short options, added description to README.txt, added new options
in generated "default.properties".
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6ffaba55
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6ffaba55
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6ffaba55
Branch: refs/heads/master
Commit: 6ffaba550bc85722823c7b67140e84c370716693
Parents: 94fce97
Author: Alexey Kuznetsov
Authored: Sat Dec 29 18:32:25 2018 +0700
Committer: Alexey Kuznetsov
Committed: Sat Dec 29 18:32:25 2018 +0700
--
.../web-console/backend/services/downloads.js | 10
modules/web-console/web-agent/README.txt| 50
.../console/agent/AgentConfiguration.java | 10 ++--
.../apache/ignite/console/agent/AgentUtils.java | 2 +-
4 files changed, 56 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ffaba55/modules/web-console/backend/services/downloads.js
--
diff --git a/modules/web-console/backend/services/downloads.js
b/modules/web-console/backend/services/downloads.js
index d7f616a..75548c8 100644
--- a/modules/web-console/backend/services/downloads.js
+++ b/modules/web-console/backend/services/downloads.js
@@ -67,6 +67,16 @@ module.exports.factory = (settings, agentsHnd, errors) => {
prop.push('#node-login=ignite');
prop.push('#node-password=ignite');
prop.push('#driver-folder=./jdbc-drivers');
+prop.push('#Uncomment and configure following SSL
options if needed:');
+prop.push('#node-key-store=client.jks');
+prop.push('#node-key-store-password=MY_PASSWORD');
+prop.push('#node-trust-store=ca.jks');
+
prop.push('#node-trust-store-password=MY_PASSWORD');
+prop.push('#server-key-store=client.jks');
+
prop.push('#server-key-store-password=MY_PASSWORD');
+prop.push('#server-trust-store=ca.jks');
+
prop.push('#server-trust-store-password=MY_PASSWORD');
+
prop.push('#cipher-suites=CIPHER1,CIPHER2,CIPHER3');
zip.file(`${folder}/default.properties`,
prop.join('\n'));
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ffaba55/modules/web-console/web-agent/README.txt
--
diff --git a/modules/web-console/web-agent/README.txt
b/modules/web-console/web-agent/README.txt
index 86f12b8..6b29902 100644
--- a/modules/web-console/web-agent/README.txt
+++ b/modules/web-console/web-agent/README.txt
@@ -23,6 +23,15 @@ Configuration file:
node-login
node-password
driver-folder
+node-key-store
+node-key-store-password
+node-trust-store
+node-trust-store-password
+server-key-store
+server-key-store-password
+server-trust-store
+server-trust-store-password
+cipher-suites
Example configuration file:
tokens=1a2b3c4d5f,2j1s134d12
@@ -41,23 +50,44 @@ Ignite Web agent requirements:
Options:
-h, --help
- Print this help message.
+Print this help message
-c, --config
- Path to configuration file
+Path to agent property file
+Default value: default.properties
-d, --driver-folder
- Path to folder with JDBC drivers, default value: ./jdbc-drivers
+Path to folder with JDBC drivers
+Default value: ./jdbc-drivers
-n, --node-uri
- Comma-separated list of URIs for connect to Ignite REST server,
- default value: http://localhost:8080
+Comma-separated list of URIs for connect to Ignite node via REST
+Default value: http://localhost:8080
-nl, --node-login
- User name that will be used to connect to secured cluster.
+User name that will be used to connect to secured cluster
-np, --node-password
- Password that will be used to connect to secured cluster
+Password that will be used to connect to secured cluster
-s, --server-uri
- URI for connect to Ignite Web Console via web-socket protocol,
- default value: http://localhost:3000
+URI for connect to Ignite Console via web-socket protocol
+Default value: http://localhost:3000
-t, --tokens
- Comma-separated list of user's security tokens.
+ User's tokens separated by comma used to connect to Ignite Console.
+ -nks, --node-key-store
+Path to key store that
ignite git commit: IGNITE-10839 Web Console: Added optional email confirmation.
Repository: ignite Updated Branches: refs/heads/master dfef77e59 -> cdf2d867f IGNITE-10839 Web Console: Added optional email confirmation. Co-authored-by: Andrey Novikov Co-authored-by: Ilya Borisov Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cdf2d867 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cdf2d867 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cdf2d867 Branch: refs/heads/master Commit: cdf2d867fecef4459edb0f128c017cbb7b21ba07 Parents: dfef77e Author: Andrey Novikov Authored: Fri Dec 28 13:52:50 2018 +0700 Committer: Alexey Kuznetsov Committed: Fri Dec 28 13:52:50 2018 +0700 -- modules/web-console/assembly/README.txt | 25 +++--- modules/web-console/backend/app/mongo.js| 20 - modules/web-console/backend/app/schemas.js | 5 +- modules/web-console/backend/app/settings.js | 14 .../backend/config/settings.json.sample | 5 ++ .../MissingConfirmRegistrationException.js | 34 modules/web-console/backend/errors/index.js | 2 + modules/web-console/backend/middlewares/api.js | 3 + modules/web-console/backend/routes/public.js| 53 + modules/web-console/backend/services/auth.js| 83 ++-- modules/web-console/backend/services/mails.js | 18 + modules/web-console/backend/services/users.js | 32 ++-- modules/web-console/frontend/app/app.js | 5 +- .../list-of-registered-users/categories.js | 1 + .../list-of-registered-users/column-defs.js | 1 + .../app/components/page-signin/component.ts | 5 +- .../app/components/page-signin/controller.ts| 10 ++- .../frontend/app/components/page-signin/run.ts | 11 ++- .../app/components/page-signin/template.pug | 4 +- .../page-signup-confirmation/component.ts | 28 +++ .../page-signup-confirmation/controller.ts | 42 ++ .../page-signup-confirmation/index.ts | 23 ++ .../page-signup-confirmation/state.ts | 48 +++ .../page-signup-confirmation/style.scss | 22 ++ .../page-signup-confirmation/template.tpl.pug | 24 ++ .../app/components/page-signup/controller.ts| 7 ++ .../frontend/app/modules/user/Auth.service.ts | 14 +++- .../user/emailConfirmationInterceptor.ts| 37 + .../frontend/app/modules/user/user.module.js| 27 --- 29 files changed, 540 insertions(+), 63 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/cdf2d867/modules/web-console/assembly/README.txt -- diff --git a/modules/web-console/assembly/README.txt b/modules/web-console/assembly/README.txt index 2656aca..e88e345 100644 --- a/modules/web-console/assembly/README.txt +++ b/modules/web-console/assembly/README.txt @@ -41,21 +41,24 @@ Technical details On Windows: `ignite-web-console-win.exe --server:port 3000` All available parameters with defaults: -Web Console host: --server:host 0.0.0.0 -Web Console port: --server:port 80 +Web Console host: --server:host 0.0.0.0 +Web Console port: --server:port 80 -Enable HTTPS: --server:ssl false +Enable HTTPS: --server:ssl false +Disable self registration: --server:disable:signup false -Disable self registration: --server:disable:signup false +MongoDB URL: --mongodb:url mongodb://localhost/console -MongoDB URL:--mongodb:url mongodb://localhost/console +Enable account activation: --activation:enabled false +Activation timeout(milliseconds): --activation:timeout 180 +Activation send email throttle (milliseconds): --activation:sendTimeout 18 -Mail service: --mail:service "gmail" -Signature text: --mail:sign "Kind regards, Apache Ignite Team" -Greeting text: --mail:greeting "Apache Ignite Web Console" -Mail FROM: --mail:from "Apache Ignite Web Console " -User to send e-mail:--mail:auth:user "someusername@somecompany.somedomain" -E-mail service password:--mail:auth:pass "" +Mail service: --mail:service "gmail" +Signature text:--mail:sign "Kind regards, Apache Ignite Team" +Greeting text: --mail:greeting "Apache Ignite Web Console" +Mail FROM: --mail:from "Apache Ignite Web Console " +User to send e-mail: --mail:auth:user
[1/2] ignite git commit: IGNITE-9845 Web Console: Added support for two way SSL between browser, web server, agent and cluster.
Repository: ignite
Updated Branches:
refs/heads/master ca932821a -> 9f9bb7520
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f9bb752/modules/web-console/web-agent/src/test/java/org/apache/ignite/console/agent/rest/RestExecutorSelfTest.java
--
diff --git
a/modules/web-console/web-agent/src/test/java/org/apache/ignite/console/agent/rest/RestExecutorSelfTest.java
b/modules/web-console/web-agent/src/test/java/org/apache/ignite/console/agent/rest/RestExecutorSelfTest.java
new file mode 100644
index 000..6a4fe6c
--- /dev/null
+++
b/modules/web-console/web-agent/src/test/java/org/apache/ignite/console/agent/rest/RestExecutorSelfTest.java
@@ -0,0 +1,329 @@
+/*
+ * 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.console.agent.rest;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.net.ssl.SSLHandshakeException;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import
org.apache.ignite.internal.processors.rest.protocols.http.jetty.GridJettyObjectMapper;
+import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+/**
+ * Test for RestExecutor.
+ */
+public class RestExecutorSelfTest {
+/** Name of the cache created by default in the cluster. */
+private static final String DEFAULT_CACHE_NAME = "default";
+
+/** Path to certificates and configs. */
+private static final String PATH_TO_RESOURCES =
"modules/web-console/web-agent/src/test/resources/";
+
+/** JSON object mapper. */
+private static final ObjectMapper MAPPER = new GridJettyObjectMapper();
+
+/** */
+private static final String HTTP_URI = "http://localhost:8080;;
+
+/** */
+private static final String HTTPS_URI = "https://localhost:8080;;
+
+/** */
+private static final String JETTY_WITH_SSL = "jetty-with-ssl.xml";
+
+/** */
+private static final String JETTY_WITH_CIPHERS_0 =
"jetty-with-ciphers-0.xml";
+
+/** */
+private static final String JETTY_WITH_CIPHERS_1 =
"jetty-with-ciphers-1.xml";
+
+/** */
+private static final String JETTY_WITH_CIPHERS_2 =
"jetty-with-ciphers-2.xml";
+
+/** This cipher is disabled by default in JDK 8. */
+private static final List CIPHER_0 =
Collections.singletonList("TLS_DH_anon_WITH_AES_256_GCM_SHA384");
+
+/** */
+private static final List CIPHER_1 =
Collections.singletonList("TLS_RSA_WITH_NULL_SHA256");
+
+/** */
+private static final List CIPHER_2 =
Collections.singletonList("TLS_ECDHE_ECDSA_WITH_NULL_SHA");
+
+/** */
+private static final List COMMON_CIPHERS = Arrays.asList(
+"TLS_RSA_WITH_NULL_SHA256",
+"TLS_ECDHE_ECDSA_WITH_NULL_SHA"
+);
+
+/** */
+@Rule
+public final ExpectedException ruleForExpectedException =
ExpectedException.none();
+
+/**
+ * @param jettyCfg Optional path to file with Jetty XML config.
+ * @return Prepare configuration for cluster node.
+ */
+private IgniteConfiguration nodeConfiguration(String jettyCfg) {
+TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder();
+
+ipFinder.registerAddresses(Collections.singletonList(new
InetSocketAddress("127.0.0.1", 47500)));
+
+TcpDiscoverySpi discoverySpi = new TcpDiscoverySpi();
+
+discoverySpi.setIpFinder(ipFinder);
+
+
[2/2] ignite git commit: IGNITE-9845 Web Console: Added support for two way SSL between browser, web server, agent and cluster.
IGNITE-9845 Web Console: Added support for two way SSL between browser, web
server, agent and cluster.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9f9bb752
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9f9bb752
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9f9bb752
Branch: refs/heads/master
Commit: 9f9bb75201a3c4a4ca5398c450d741a095321167
Parents: ca93282
Author: Alexey Kuznetsov
Authored: Thu Dec 27 16:36:02 2018 +0700
Committer: Alexey Kuznetsov
Committed: Thu Dec 27 16:36:02 2018 +0700
--
.../ignite/ssl/DelegatingSSLContextSpi.java | 4 +-
.../ignite/ssl/SSLSocketFactoryWrapper.java | 64 ++--
modules/web-console/assembly/README.txt | 46 ++-
.../web-console/backend/app/browsersHandler.js | 34 +-
modules/web-console/backend/app/settings.js | 66 +++-
.../backend/config/settings.json.sample | 51 +--
modules/web-console/backend/launch-tools.js | 6 +-
modules/web-console/backend/package.json| 2 +-
modules/web-console/frontend/app/app.js | 3 -
.../connected-clusters-badge/controller.js | 11 +-
.../app/modules/agent/AgentManager.service.js | 12 +-
.../frontend/app/modules/demo/Demo.module.js| 24 +-
.../frontend/app/utils/SimpleWorkerPool.js | 2 +-
modules/web-console/frontend/app/vendor.js | 1 -
modules/web-console/frontend/package.json | 5 +-
.../web-console/frontend/webpack/webpack.dev.js | 25 +-
modules/web-console/web-agent/pom.xml | 18 +-
.../console/agent/AgentConfiguration.java | 330 +--
.../ignite/console/agent/AgentLauncher.java | 89 +++--
.../apache/ignite/console/agent/AgentUtils.java | 140 +++-
.../agent/handlers/AbstractListener.java| 9 +-
.../console/agent/handlers/ClusterListener.java | 77 ++---
.../console/agent/handlers/RestListener.java| 6 +-
.../ignite/console/agent/rest/RestExecutor.java | 84 +++--
.../agent/rest/RestExecutorSelfTest.java| 329 ++
.../testsuites/IgniteWebAgentTestSuite.java | 33 ++
.../web-agent/src/test/resources/ca.jks | Bin 0 -> 1394 bytes
.../web-agent/src/test/resources/client.jks | Bin 0 -> 2030 bytes
.../web-agent/src/test/resources/generate.bat | 122 +++
.../web-agent/src/test/resources/generate.sh| 111 +++
.../src/test/resources/jetty-with-ciphers-0.xml | 94 ++
.../src/test/resources/jetty-with-ciphers-1.xml | 94 ++
.../src/test/resources/jetty-with-ciphers-2.xml | 94 ++
.../src/test/resources/jetty-with-ssl.xml | 89 +
.../web-agent/src/test/resources/server.jks | Bin 0 -> 1419 bytes
35 files changed, 1794 insertions(+), 281 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f9bb752/modules/core/src/main/java/org/apache/ignite/ssl/DelegatingSSLContextSpi.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/ssl/DelegatingSSLContextSpi.java
b/modules/core/src/main/java/org/apache/ignite/ssl/DelegatingSSLContextSpi.java
index d8621f2..360e922 100644
---
a/modules/core/src/main/java/org/apache/ignite/ssl/DelegatingSSLContextSpi.java
+++
b/modules/core/src/main/java/org/apache/ignite/ssl/DelegatingSSLContextSpi.java
@@ -31,7 +31,6 @@ import javax.net.ssl.TrustManager;
/** */
class DelegatingSSLContextSpi extends SSLContextSpi {
-
/** */
private final SSLContext delegate;
@@ -57,8 +56,7 @@ class DelegatingSSLContextSpi extends SSLContextSpi {
/** {@inheritDoc} */
@Override protected SSLServerSocketFactory engineGetServerSocketFactory() {
-return new
SSLServerSocketFactoryWrapper(delegate.getServerSocketFactory(),
-parameters);
+return new
SSLServerSocketFactoryWrapper(delegate.getServerSocketFactory(), parameters);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f9bb752/modules/core/src/main/java/org/apache/ignite/ssl/SSLSocketFactoryWrapper.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/ssl/SSLSocketFactoryWrapper.java
b/modules/core/src/main/java/org/apache/ignite/ssl/SSLSocketFactoryWrapper.java
index bfe6d0d..992f836 100644
---
a/modules/core/src/main/java/org/apache/ignite/ssl/SSLSocketFactoryWrapper.java
+++
b/modules/core/src/main/java/org/apache/ignite/ssl/SSLSocketFactoryWrapper.java
@@ -24,9 +24,10 @@ import javax.net.ssl.SSLParameters;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
-/** */
+/**
+ * SSL socket factory that configure additional SSL params for socket.
+ */
class SSLSocketFactoryWrapper extends SSLSocketFactory {
-
ignite git commit: IGNITE-10279 Control.sh: Unified options naming format. Fixes #5672.
Repository: ignite
Updated Branches:
refs/heads/master bf005c83e -> 7d933e8e1
IGNITE-10279 Control.sh: Unified options naming format. Fixes #5672.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7d933e8e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7d933e8e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7d933e8e
Branch: refs/heads/master
Commit: 7d933e8e13c48a16b8184e0df4c37f71b7d57f33
Parents: bf005c8
Author: Sergey Antonov
Authored: Mon Dec 24 15:11:22 2018 +0700
Committer: Alexey Kuznetsov
Committed: Mon Dec 24 15:11:22 2018 +0700
--
.../ignite/internal/TransactionsMXBeanImpl.java | 8 +-
.../ignite/internal/commandline/Command.java| 5 +
.../internal/commandline/CommandHandler.java| 241 +++
.../commandline/cache/CacheCommand.java | 5 +
.../verify/VerifyBackupPartitionsDumpTask.java | 5 +-
.../internal/visor/tx/VisorTxSortOrder.java | 17 --
.../commandline/CommandHandlerParsingTest.java | 12 +-
.../ignite/util/GridCommandHandlerTest.java | 121 +-
.../util/GridCommandHandlerIndexingTest.java| 6 +-
9 files changed, 236 insertions(+), 184 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/7d933e8e/modules/core/src/main/java/org/apache/ignite/internal/TransactionsMXBeanImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/TransactionsMXBeanImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/TransactionsMXBeanImpl.java
index 16738de..a8a3c88 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/TransactionsMXBeanImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/TransactionsMXBeanImpl.java
@@ -72,12 +72,8 @@ public class TransactionsMXBeanImpl implements
TransactionsMXBean {
VisorTxSortOrder sortOrder = null;
-if (order != null) {
-if ("DURATION".equals(order))
-sortOrder = VisorTxSortOrder.DURATION;
-else if ("SIZE".equals(order))
-sortOrder = VisorTxSortOrder.SIZE;
-}
+if (order != null)
+sortOrder = VisorTxSortOrder.valueOf(order.toUpperCase());
VisorTxTaskArg arg = new VisorTxTaskArg(kill ?
VisorTxOperation.KILL : VisorTxOperation.LIST,
limit, minDuration == null ? null : minDuration * 1000,
minSize, null, proj, consIds, xid, lbRegex, sortOrder);
http://git-wip-us.apache.org/repos/asf/ignite/blob/7d933e8e/modules/core/src/main/java/org/apache/ignite/internal/commandline/Command.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/Command.java
b/modules/core/src/main/java/org/apache/ignite/internal/commandline/Command.java
index c64e488..1f7c0a3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/Command.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/commandline/Command.java
@@ -71,4 +71,9 @@ public enum Command {
public String text() {
return text;
}
+
+/** {@inheritDoc} */
+@Override public String toString() {
+return text;
+}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/7d933e8e/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
index 9923fb4..fbc8819 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
@@ -186,19 +186,19 @@ public class CommandHandler {
private static final String CMD_AUTO_CONFIRMATION = "--yes";
/** */
-protected static final String CMD_PING_INTERVAL = "--ping-interval";
+private static final String CMD_PING_INTERVAL = "--ping-interval";
/** */
-protected static final String CMD_PING_TIMEOUT = "--ping-timeout";
+private static final String CMD_PING_TIMEOUT = "--ping-timeout";
/** */
private static final String CMD_DUMP = "--dump";
/** */
-private static final String CMD_SKIP_ZEROS = "--skipZeros";
+private static final String CMD_SKIP_ZEROS = "--skip-zeros";
/** Cache filter. */
-private static final String CACHE_FILTER = "--cacheFilter";
+private static final String CACHE_FILTER = "--cache-filter";
/** */
private static final
ignite git commit: IGNITE-10658 Visor: Fixed rebalance progress calculation logic. Fixes #5706.
Repository: ignite
Updated Branches:
refs/heads/master 47d7c6d4c -> 59c542034
IGNITE-10658 Visor: Fixed rebalance progress calculation logic. Fixes #5706.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/59c54203
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/59c54203
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/59c54203
Branch: refs/heads/master
Commit: 59c5420345a0decadced3d3b9b1e86ce0f7dda47
Parents: 47d7c6d
Author: Pavel Voronkin
Authored: Fri Dec 21 22:31:38 2018 +0700
Committer: Alexey Kuznetsov
Committed: Fri Dec 21 22:31:38 2018 +0700
--
.../node/VisorCacheRebalanceCollectorTask.java | 2 +-
.../visor/node/VisorNodeDataCollectorJob.java | 4 +-
.../cache/CacheGroupsMetricsRebalanceTest.java | 75
3 files changed, 79 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/59c54203/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheRebalanceCollectorTask.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheRebalanceCollectorTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheRebalanceCollectorTask.java
index eda9f94..9d0e041 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheRebalanceCollectorTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheRebalanceCollectorTask.java
@@ -158,7 +158,7 @@ public class VisorCacheRebalanceCollectorTask extends
VisorMultiNodeTask 0 ? Math.max(ready / total,
MINIMAL_REBALANCE) : REBALANCE_COMPLETE);
+res.setRebalance(total > 0 && rebalanceInProgress ?
Math.max(ready / total, MINIMAL_REBALANCE) : REBALANCE_COMPLETE);
}
catch (Exception e) {
res.setRebalance(REBALANCE_NOT_AVAILABLE);
http://git-wip-us.apache.org/repos/asf/ignite/blob/59c54203/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
index 9a7d2b1..3a115df 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
@@ -249,7 +249,9 @@ public class VisorNodeDataCollectorJob extends
VisorJob 0 ? Math.max(ready / total,
MINIMAL_REBALANCE) : REBALANCE_COMPLETE);
+res.setRebalance(total > 0 && rebalanceInProgress
+? Math.max(ready / total, MINIMAL_REBALANCE)
+: REBALANCE_COMPLETE);
}
catch (Exception e) {
res.setRebalance(REBALANCE_NOT_AVAILABLE);
http://git-wip-us.apache.org/repos/asf/ignite/blob/59c54203/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupsMetricsRebalanceTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupsMetricsRebalanceTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupsMetricsRebalanceTest.java
index 97c5fdc..fab28b3 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupsMetricsRebalanceTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupsMetricsRebalanceTest.java
@@ -17,6 +17,8 @@
package org.apache.ignite.internal.processors.cache;
+import java.util.Collections;
+import java.util.Random;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.apache.ignite.Ignite;
@@ -31,13 +33,19 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.events.CacheRebalancingEvent;
import org.apache.ignite.events.Event;
import org.apache.ignite.events.EventType;
+import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.util.lang.GridAbsPredicate;
import org.apache.ignite.internal.util.typedef.PA;
import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorTaskArgument;
+import org.apache.ignite.internal.visor.node.VisorNodeDataCollectorTask;
+import org.apache.ignite.internal.visor.node.VisorNodeDataCollectorTaskArg;
+import org.apache.ignite.internal.visor.node.VisorNodeDataCollectorTaskResult;
import
[1/2] ignite git commit: IGNITE-9839 Web Console: update to RxJS 6.
Repository: ignite
Updated Branches:
refs/heads/master 388f7ffc4 -> 7d4e1fd11
http://git-wip-us.apache.org/repos/asf/ignite/blob/7d4e1fd1/modules/web-console/frontend/app/components/page-configure/store/effects.js
--
diff --git
a/modules/web-console/frontend/app/components/page-configure/store/effects.js
b/modules/web-console/frontend/app/components/page-configure/store/effects.js
index 014076b..ac807dc 100644
---
a/modules/web-console/frontend/app/components/page-configure/store/effects.js
+++
b/modules/web-console/frontend/app/components/page-configure/store/effects.js
@@ -15,23 +15,8 @@
* limitations under the License.
*/
-import {Observable} from 'rxjs/Observable';
-import 'rxjs/add/operator/ignoreElements';
-import 'rxjs/add/operator/let';
-import 'rxjs/add/operator/exhaustMap';
-import 'rxjs/add/operator/switchMap';
-import 'rxjs/add/operator/map';
-import 'rxjs/add/operator/pluck';
-import 'rxjs/add/operator/withLatestFrom';
-import 'rxjs/add/operator/merge';
-import 'rxjs/add/operator/take';
-import 'rxjs/add/operator/catch';
-import 'rxjs/add/operator/zip';
-import {merge} from 'rxjs/observable/merge';
-import {empty} from 'rxjs/observable/empty';
-import {of} from 'rxjs/observable/of';
-import {from} from 'rxjs/observable/from';
-import {fromPromise} from 'rxjs/observable/fromPromise';
+import {merge, empty, of, from} from 'rxjs';
+import {mapTo, filter, tap, ignoreElements, exhaustMap, switchMap, map, pluck,
withLatestFrom, take, catchError, zip} from 'rxjs/operators';
import uniq from 'lodash/uniq';
import {uniqueName} from 'app/utils/uniqueName';
import {defaultNames} from '../defaultNames';
@@ -81,7 +66,7 @@ import Models from 'app/services/Models';
import IGFSs from 'app/services/IGFSs';
import {Confirm} from 'app/services/Confirm.service';
-export const ofType = (type) => (s) => s.filter((a) => a.type === type);
+export const ofType = (type) => (s) => s.pipe(filter((a) => a.type === type));
export default class ConfigEffects {
static $inject = [
@@ -124,35 +109,37 @@ export default class ConfigEffects {
this.Confirm = Confirm;
this.configurationDownload = ConfigurationDownload;
-this.loadConfigurationEffect$ = this.ConfigureState.actions$
-.let(ofType('LOAD_COMPLETE_CONFIGURATION'))
-.exhaustMap((action) => {
-return
fromPromise(this.Clusters.getConfiguration(action.clusterID))
-.switchMap(({data}) => of(
+this.loadConfigurationEffect$ = this.ConfigureState.actions$.pipe(
+ofType('LOAD_COMPLETE_CONFIGURATION'),
+exhaustMap((action) => {
+return
from(this.Clusters.getConfiguration(action.clusterID)).pipe(
+switchMap(({data}) => of(
completeConfiguration(data),
{type: 'LOAD_COMPLETE_CONFIGURATION_OK', data}
-))
-.catch((error) => of({
+)),
+catchError((error) => of({
type: 'LOAD_COMPLETE_CONFIGURATION_ERR',
error: {
message: `Failed to load cluster configuration:
${error.data}.`
},
action
-}));
-});
+})));
+})
+);
-this.storeConfigurationEffect$ = this.ConfigureState.actions$
-.let(ofType(COMPLETE_CONFIGURATION))
-.exhaustMap(({configuration: {cluster, caches, models, igfss}}) =>
of(...[
+this.storeConfigurationEffect$ = this.ConfigureState.actions$.pipe(
+ofType(COMPLETE_CONFIGURATION),
+exhaustMap(({configuration: {cluster, caches, models, igfss}}) =>
of(...[
cluster && {type: clustersActionTypes.UPSERT, items:
[cluster]},
caches && caches.length && {type: cachesActionTypes.UPSERT,
items: caches},
models && models.length && {type: modelsActionTypes.UPSERT,
items: models},
igfss && igfss.length && {type: igfssActionTypes.UPSERT,
items: igfss}
-].filter((v) => v)));
+].filter((v) => v)))
+);
-this.saveCompleteConfigurationEffect$ = this.ConfigureState.actions$
-.let(ofType(ADVANCED_SAVE_COMPLETE_CONFIGURATION))
-.switchMap((action) => {
+this.saveCompleteConfigurationEffect$ =
this.ConfigureState.actions$.pipe(
+ofType(ADVANCED_SAVE_COMPLETE_CONFIGURATION),
+switchMap((action) => {
const actions = [
{
type: modelsActionTypes.UPSERT,
@@ -188,62 +175,68 @@ export default class ConfigEffects {
}
].filter((a) => a.items.length);
-return of(...actions)
-
[2/2] ignite git commit: IGNITE-9839 Web Console: update to RxJS 6.
IGNITE-9839 Web Console: update to RxJS 6.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7d4e1fd1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7d4e1fd1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7d4e1fd1
Branch: refs/heads/master
Commit: 7d4e1fd118845f6e14638520ac10881deadd570c
Parents: 388f7ff
Author: Ilya Borisov
Authored: Wed Dec 19 10:03:31 2018 +0700
Committer: Alexey Kuznetsov
Committed: Wed Dec 19 10:03:31 2018 +0700
--
.../components/cluster-selector/controller.js | 17 +-
.../connected-clusters-badge/controller.js | 11 +-
.../components/cache-edit-form/controller.js| 10 +-
.../components/cluster-edit-form/controller.js | 10 +-
.../controller.js | 36 +-
.../controller.js | 29 +-
.../page-configure-advanced-igfs/controller.js | 49 +-
.../controller.js | 45 +-
.../page-configure-basic/controller.js | 87 ++-
.../page-configure-basic/controller.spec.js | 6 +-
.../page-configure-overview/controller.js | 11 +-
.../components/modal-import-models/component.js | 111 ++--
.../app/components/page-configure/controller.js | 15 +-
.../app/components/page-configure/index.d.ts| 29 +-
.../app/components/page-configure/index.ts | 26 +-
.../services/ConfigChangesGuard.js | 11 +-
.../services/ConfigSelectionManager.js | 75 +--
.../page-configure/services/ConfigureState.js | 11 +-
.../page-configure/services/PageConfigure.js| 49 +-
.../services/PageConfigure.spec.js | 17 +-
.../app/components/page-configure/states.js | 62 +-
.../components/page-configure/store/effects.js | 638 ++-
.../page-configure/store/effects.spec.js| 7 +-
.../page-configure/store/selectors.js | 159 ++---
.../components/queries-notebook/controller.ts | 30 +-
.../app/modules/agent/AgentManager.service.js | 25 +-
.../frontend/app/modules/user/User.service.js | 2 +-
.../frontend/app/services/Clusters.js | 9 +-
.../frontend/app/services/Version.service.js| 2 +-
.../web-console/frontend/app/services/store.ts | 10 +-
.../web-console/frontend/app/store/ofType.ts| 2 +-
.../frontend/app/utils/SimpleWorkerPool.js | 19 +-
modules/web-console/frontend/package.json | 4 +-
33 files changed, 869 insertions(+), 755 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/7d4e1fd1/modules/web-console/frontend/app/components/cluster-selector/controller.js
--
diff --git
a/modules/web-console/frontend/app/components/cluster-selector/controller.js
b/modules/web-console/frontend/app/components/cluster-selector/controller.js
index fb64b9f..484a5eb 100644
--- a/modules/web-console/frontend/app/components/cluster-selector/controller.js
+++ b/modules/web-console/frontend/app/components/cluster-selector/controller.js
@@ -17,8 +17,8 @@
import _ from 'lodash';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import 'rxjs/add/operator/combineLatest';
+import { BehaviorSubject } from 'rxjs';
+import {tap, filter, combineLatest} from 'rxjs/operators';
export default class {
static $inject = ['AgentManager', 'IgniteConfirm', 'IgniteVersion',
'IgniteMessages'];
@@ -46,15 +46,16 @@ export default class {
this.inProgress$ = this._inProgressSubject.asObservable();
-this.clusters$ = this.agentMgr.connectionSbj
-.combineLatest(this.inProgress$)
-.do(([sbj, inProgress]) => this.inProgress = inProgress)
-.filter(([sbj, inProgress]) => !inProgress)
-.do(([{cluster, clusters}]) => {
+this.clusters$ = this.agentMgr.connectionSbj.pipe(
+combineLatest(this.inProgress$),
+tap(([sbj, inProgress]) => this.inProgress = inProgress),
+filter(([sbj, inProgress]) => !inProgress),
+tap(([{cluster, clusters}]) => {
this.cluster = cluster ? {...cluster} : null;
this.clusters = _.orderBy(clusters, ['name'], ['asc']);
})
-.subscribe(() => {});
+)
+.subscribe(() => {});
}
$onDestroy() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/7d4e1fd1/modules/web-console/frontend/app/components/connected-clusters-badge/controller.js
--
diff --git
a/modules/web-console/frontend/app/components/connected-clusters-badge/controller.js
b/modules/web-console/frontend/app/components/connected-clusters-badge/controller.js
index 807c3ba..294f955 100644
---
ignite git commit: IGNITE-4890 Support Cassandra message 'unconfigured columnfamily'. Fixes #1719.
Repository: ignite
Updated Branches:
refs/heads/master 0eb5bcc69 -> 84a8e8108
IGNITE-4890 Support Cassandra message 'unconfigured columnfamily'. Fixes #1719.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/84a8e810
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/84a8e810
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/84a8e810
Branch: refs/heads/master
Commit: 84a8e8108f973719f1f05e41818ec3ac93312d1b
Parents: 0eb5bcc
Author: Venky Kandaswamy
Authored: Tue Dec 18 10:54:36 2018 +0700
Committer: Alexey Kuznetsov
Committed: Tue Dec 18 10:54:36 2018 +0700
--
.../ignite/cache/store/cassandra/common/CassandraHelper.java | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/84a8e810/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/CassandraHelper.java
--
diff --git
a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/CassandraHelper.java
b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/CassandraHelper.java
index 9492cec..c3981b3 100644
---
a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/CassandraHelper.java
+++
b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/CassandraHelper.java
@@ -49,6 +49,9 @@ public class CassandraHelper {
/** Cassandra error message if specified table doesn't exist. */
private static final String TABLE_EXIST_ERROR2 = "Error preparing query,
got ERROR INVALID: unconfigured table";
+
+/** Cassandra error message if specified table doesn't exist. */
+private static final Pattern TABLE_EXIST_ERROR3 =
Pattern.compile("unconfigured columnfamily [0-9a-zA-Z_]+");
/** Cassandra error message if trying to use prepared statement created
from another session. */
private static final String PREP_STATEMENT_CLUSTER_INSTANCE_ERROR = "You
may have used a PreparedStatement that " +
@@ -97,6 +100,7 @@ public class CassandraHelper {
while (e != null) {
if (e instanceof InvalidQueryException &&
(TABLE_EXIST_ERROR1.matcher(e.getMessage()).matches() ||
+ TABLE_EXIST_ERROR3.matcher(e.getMessage()).matches() ||
KEYSPACE_EXIST_ERROR1.matcher(e.getMessage()).matches() ||
KEYSPACE_EXIST_ERROR2.matcher(e.getMessage()).matches()))
return true;
ignite git commit: IGNITE-10189 Minor fixes of code style.
Repository: ignite
Updated Branches:
refs/heads/master 165566501 -> 90508b895
IGNITE-10189 Minor fixes of code style.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/90508b89
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/90508b89
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/90508b89
Branch: refs/heads/master
Commit: 90508b89593a11cecd6d4d948d6d4bdb4c5e0eff
Parents: 1655665
Author: Alexey Kuznetsov
Authored: Fri Dec 14 10:53:13 2018 +0700
Committer: Alexey Kuznetsov
Committed: Fri Dec 14 10:53:13 2018 +0700
--
.../apache/ignite/internal/client/ClientSslParametersTest.java| 3 +--
.../org/apache/ignite/internal/commandline/CommandHandler.java| 2 --
.../src/test/java/org/apache/ignite/client/SslParametersTest.java | 2 +-
3 files changed, 2 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/90508b89/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslParametersTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslParametersTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslParametersTest.java
index 9f93999..c2e10b8 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslParametersTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslParametersTest.java
@@ -333,7 +333,6 @@ public class ClientSslParametersTest extends
GridCommonAbstractTest {
},
GridClientException.class,
msg
-);
+);
}
-
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/90508b89/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
index 8dcceed..44f652c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
@@ -646,7 +646,6 @@ public class CommandHandler {
/**
* @param client Client.
- *
* @return List of hosts.
*/
private Stream> listHosts(GridClient
client) throws GridClientException {
@@ -660,7 +659,6 @@ public class CommandHandler {
/**
* @param client Client.
- *
* @return List of hosts.
*/
private Stream>>
listHostsByClientNode(GridClient client) throws GridClientException {
http://git-wip-us.apache.org/repos/asf/ignite/blob/90508b89/modules/core/src/test/java/org/apache/ignite/client/SslParametersTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/client/SslParametersTest.java
b/modules/core/src/test/java/org/apache/ignite/client/SslParametersTest.java
index 9817120..a950d6d 100644
--- a/modules/core/src/test/java/org/apache/ignite/client/SslParametersTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/client/SslParametersTest.java
@@ -101,7 +101,7 @@ public class SslParametersTest extends
GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
-@Test
+@Test
public void testSameCipherSuite() throws Exception {
cipherSuites = new String[] {
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
ignite git commit: IGNITE-10667 Web Console: Fixed model for "keyStoreFilePath" on "Configuration" screen.
Repository: ignite
Updated Branches:
refs/heads/master d7af98538 -> eb0584b0d
IGNITE-10667 Web Console: Fixed model for "keyStoreFilePath" on "Configuration"
screen.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eb0584b0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eb0584b0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eb0584b0
Branch: refs/heads/master
Commit: eb0584b0d394010fe6202579d33d36607d2a15bf
Parents: d7af985
Author: Vasiliy Sisko
Authored: Thu Dec 13 16:47:42 2018 +0700
Committer: Alexey Kuznetsov
Committed: Thu Dec 13 16:47:42 2018 +0700
--
.../components/cluster-edit-form/templates/ssl.pug | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb0584b0/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/ssl.pug
--
diff --git
a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/ssl.pug
b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/ssl.pug
index 61c722e..f979124 100644
---
a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/ssl.pug
+++
b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/ssl.pug
@@ -51,7 +51,7 @@ panel-collapsible(ng-form=form
on-open=`ui.loadPanel('${form}')`)
.pc-form-grid-col-60
+form-field__text({
label: 'Key store file:',
-model: `${secondaryFileSystem}.keyStoreFilePath`,
+model: `${model}.keyStoreFilePath`,
name: '"keyStoreFilePath"',
disabled: `!(${enabled})`,
required: enabled,
ignite git commit: IGNITE-10617 Web console: Fixed wrong class name.
Repository: ignite
Updated Branches:
refs/heads/master 489e30428 -> c12f1c519
IGNITE-10617 Web console: Fixed wrong class name.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c12f1c51
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c12f1c51
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c12f1c51
Branch: refs/heads/master
Commit: c12f1c5192d4bc77b7c14e2b5ae4d5011c12aea2
Parents: 489e304
Author: Vasiliy Sisko
Authored: Thu Dec 13 10:50:39 2018 +0700
Committer: Alexey Kuznetsov
Committed: Thu Dec 13 10:50:39 2018 +0700
--
.../connected-clusters-dialog/components/list/controller.js| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/c12f1c51/modules/web-console/frontend/app/components/connected-clusters-dialog/components/list/controller.js
--
diff --git
a/modules/web-console/frontend/app/components/connected-clusters-dialog/components/list/controller.js
b/modules/web-console/frontend/app/components/connected-clusters-dialog/components/list/controller.js
index 2d0ca26..b69f8a2 100644
---
a/modules/web-console/frontend/app/components/connected-clusters-dialog/components/list/controller.js
+++
b/modules/web-console/frontend/app/components/connected-clusters-dialog/components/list/controller.js
@@ -19,7 +19,7 @@ import _ from 'lodash';
import columnDefs from './column-defs';
-export default class SnapshotsListCachesCtrl {
+export default class ConnectedClustersListCtrl {
static $inject = ['$scope', 'AgentManager'];
/**
ignite git commit: IGNITE-10661 Fixed Docker image for E2E tests.
Repository: ignite Updated Branches: refs/heads/master d7fd859ca -> e8d0831ff IGNITE-10661 Fixed Docker image for E2E tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e8d0831f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e8d0831f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e8d0831f Branch: refs/heads/master Commit: e8d0831ffbcb80ae2dda9b5c1e187938c7668717 Parents: d7fd859 Author: Alexander Kalinin Authored: Wed Dec 12 22:26:09 2018 +0700 Committer: Alexey Kuznetsov Committed: Wed Dec 12 22:26:09 2018 +0700 -- modules/web-console/frontend/test/ci/Dockerfile | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e8d0831f/modules/web-console/frontend/test/ci/Dockerfile -- diff --git a/modules/web-console/frontend/test/ci/Dockerfile b/modules/web-console/frontend/test/ci/Dockerfile index 2573534..7b1d602 100644 --- a/modules/web-console/frontend/test/ci/Dockerfile +++ b/modules/web-console/frontend/test/ci/Dockerfile @@ -15,10 +15,12 @@ # limitations under the License. # -FROM alpine:edge +FROM node:8-alpine + +ENV NPM_CONFIG_LOGLEVEL error RUN apk --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ add \ - nodejs nodejs-npm chromium xwininfo xvfb dbus eudev ttf-freefont fluxbox + chromium xwininfo xvfb dbus eudev ttf-freefont fluxbox ENV CHROME_BIN /usr/bin/chromium-browser
ignite git commit: IGNITE-10189 Fixed tests.
Repository: ignite
Updated Branches:
refs/heads/master 91a826863 -> 20ffb7641
IGNITE-10189 Fixed tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/20ffb764
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/20ffb764
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/20ffb764
Branch: refs/heads/master
Commit: 20ffb764180a160f8c43037466f59bedde2bfdf0
Parents: 91a8268
Author: Alexey Kuznetsov
Authored: Wed Dec 12 21:20:50 2018 +0700
Committer: Alexey Kuznetsov
Committed: Wed Dec 12 21:20:50 2018 +0700
--
.../apache/ignite/internal/client/ClientSslParametersTest.java | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/20ffb764/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslParametersTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslParametersTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslParametersTest.java
index d865e5d..9f93999 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslParametersTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslParametersTest.java
@@ -181,6 +181,8 @@ public class ClientSslParametersTest extends
GridCommonAbstractTest {
@Test
@Ignore("https://issues.apache.org/jira/browse/IGNITE-10245;)
public void testNonExistentCipherSuite() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-10245;);
+
cipherSuites = new String[] {
"TLS_RSA_WITH_AES_128_GCM_SHA256"
};
@@ -224,6 +226,8 @@ public class ClientSslParametersTest extends
GridCommonAbstractTest {
@Test
@Ignore("https://issues.apache.org/jira/browse/IGNITE-10245;)
public void testNonExistentProtocol() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-10245;);
+
protocols = new String[] {
"SSLv3"
};
ignite git commit: IGNITE-10189 Implemented support for multiple protocols and cipher suites for utilities that work via o.a.i.internal.client.GridClient. This closes #5617.
Repository: ignite
Updated Branches:
refs/heads/master 47b1be6d9 -> 9098813d6
IGNITE-10189 Implemented support for multiple protocols and cipher suites for
utilities that work via o.a.i.internal.client.GridClient. This closes #5617.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9098813d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9098813d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9098813d
Branch: refs/heads/master
Commit: 9098813d6cbaa354f9ff1fef3dc4f17a499aa4d5
Parents: 47b1be6
Author: Alexey Kuznetsov
Authored: Wed Dec 12 14:07:52 2018 +0700
Committer: Alexey Kuznetsov
Committed: Wed Dec 12 14:07:52 2018 +0700
--
.../client/ClientSslParametersTest.java | 335 +++
.../client/suite/IgniteClientTestSuite.java | 4 +
.../client/ssl/GridSslBasicContextFactory.java | 88 -
.../ignite/internal/commandline/Arguments.java | 38 ++-
.../internal/commandline/CommandHandler.java| 110 --
.../apache/ignite/ssl/SSLContextWrapper.java| 13 +-
.../apache/ignite/ssl/SslContextFactory.java| 16 +-
.../apache/ignite/client/SslParametersTest.java | 146
.../ignite/util/GridCommandHandlerSslTest.java | 104 +-
9 files changed, 708 insertions(+), 146 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/9098813d/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslParametersTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslParametersTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslParametersTest.java
new file mode 100644
index 000..d865e5d
--- /dev/null
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslParametersTest.java
@@ -0,0 +1,335 @@
+/*
+ * 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.client;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Callable;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.client.ssl.GridSslBasicContextFactory;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.ssl.SslContextFactory;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.NotNull;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/**
+ * Tests cases when node connects to cluster with different set of cipher
suites.
+ */
+@RunWith(JUnit4.class)
+public class ClientSslParametersTest extends GridCommonAbstractTest {
+/** */
+public static final String TEST_CACHE_NAME = "TEST";
+
+/** */
+private volatile String[] cipherSuites;
+
+/** */
+private volatile String[] protocols;
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+cfg.setSslContextFactory(createSslFactory());
+
+cfg.setConnectorConfiguration(new ConnectorConfiguration()
+.setSslEnabled(true)
+.setSslClientAuth(true));
+
+cfg.setCacheConfiguration(new CacheConfiguration(TEST_CACHE_NAME));
+
+return cfg;
+}
+
+/**
+ * @return Client configuration.
+ */
+protected GridClientConfiguration getClientConfiguration() {
+GridClientConfiguration cfg = new GridClientConfiguration();
+
+cfg.setServers(Collections.singleton("127.0.0.1:11211"));
+
+cfg.setSslContextFactory(createOldSslFactory());
+
+return cfg;
+}
+
+/**
+ * @return SSL factory.
+ */
+
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-10189 [deleted] c77e82e37
