You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ab...@apache.org on 2020/08/21 14:37:29 UTC
[ignite] 02/02: minor updates
This is an automated email from the ASF dual-hosted git repository.
abudnikov pushed a commit to branch IGNITE-7595
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit cb418741496a7f17bfe3ccff7b10d7548e0de005
Author: abudnikov <ab...@gridgain.com>
AuthorDate: Fri Aug 21 17:36:45 2020 +0300
minor updates
---
.../org/apache/ignite/snippets/ClusterGroups.java | 43 ----------------------
.../org/apache/ignite/snippets/JavaThinClient.java | 7 +++-
.../java/org/apache/ignite/snippets/Tracing.java | 2 +-
.../distributed-computing/cluster-groups.adoc | 4 +-
docs/_docs/key-value-api/transactions.adoc | 2 +
docs/_docs/monitoring-metrics/tracing.adoc | 9 +++--
6 files changed, 17 insertions(+), 50 deletions(-)
diff --git a/docs/_docs/code-snippets/java/src/main/java/org/apache/ignite/snippets/ClusterGroups.java b/docs/_docs/code-snippets/java/src/main/java/org/apache/ignite/snippets/ClusterGroups.java
deleted file mode 100644
index 4228a54..0000000
--- a/docs/_docs/code-snippets/java/src/main/java/org/apache/ignite/snippets/ClusterGroups.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.apache.ignite.snippets;
-
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCluster;
-import org.apache.ignite.IgniteCompute;
-import org.apache.ignite.Ignition;
-import org.apache.ignite.cluster.ClusterGroup;
-
-public class ClusterGroups {
-
- void remoteNodes() {
- // tag::remote-nodes[]
- Ignite ignite = Ignition.ignite();
-
- IgniteCluster cluster = ignite.cluster();
-
- // Get compute instance which will only execute
- // over remote nodes, i.e. all the nodes except for this one.
- IgniteCompute compute = ignite.compute(cluster.forRemotes());
-
- // Broadcast to all remote nodes and print the ID of the node
- // on which this closure is executing.
- compute.broadcast(() -> System.out.println("Hello Node: " + ignite.cluster().localNode().id()));
- // end::remote-nodes[]
- }
-
- void example(Ignite ignite) {
- // tag::examples[]
- IgniteCluster cluster = ignite.cluster();
-
- // All nodes on which the cache with name "myCache" is deployed,
- // either in client or server mode.
- ClusterGroup cacheGroup = cluster.forCacheNodes("myCache");
-
- // All data nodes responsible for caching data for "myCache".
- ClusterGroup dataGroup = cluster.forDataNodes("myCache");
-
- // All client nodes that can access "myCache".
- ClusterGroup clientGroup = cluster.forClientNodes("myCache");
-
- // end::examples[]
- }
-}
diff --git a/docs/_docs/code-snippets/java/src/main/java/org/apache/ignite/snippets/JavaThinClient.java b/docs/_docs/code-snippets/java/src/main/java/org/apache/ignite/snippets/JavaThinClient.java
index 329bbc6..a0204a4 100644
--- a/docs/_docs/code-snippets/java/src/main/java/org/apache/ignite/snippets/JavaThinClient.java
+++ b/docs/_docs/code-snippets/java/src/main/java/org/apache/ignite/snippets/JavaThinClient.java
@@ -23,6 +23,8 @@ import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.client.ClientAuthenticationException;
import org.apache.ignite.client.ClientCache;
import org.apache.ignite.client.ClientCacheConfiguration;
+import org.apache.ignite.client.ClientCluster;
+import org.apache.ignite.client.ClientClusterGroup;
import org.apache.ignite.client.ClientConnectionException;
import org.apache.ignite.client.ClientException;
import org.apache.ignite.client.ClientTransaction;
@@ -30,10 +32,12 @@ import org.apache.ignite.client.ClientTransactions;
import org.apache.ignite.client.IgniteClient;
import org.apache.ignite.client.SslMode;
import org.apache.ignite.client.SslProtocol;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.ClientConfiguration;
import org.apache.ignite.configuration.ClientConnectorConfiguration;
import org.apache.ignite.configuration.ClientTransactionConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.ThinClientConfiguration;
import org.apache.ignite.ssl.SslContextFactory;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
@@ -339,7 +343,8 @@ public class JavaThinClient {
//end::partition-awareness[]
}
- void cientCluster() {
+ @Test
+ void cientCluster() throws Exception {
ClientConfiguration clientCfg = new ClientConfiguration().setAddresses("127.0.0.1:10800");
//tag::client-cluster[]
try (IgniteClient client = Ignition.startClient(clientCfg)) {
diff --git a/docs/_docs/code-snippets/java/src/main/java/org/apache/ignite/snippets/Tracing.java b/docs/_docs/code-snippets/java/src/main/java/org/apache/ignite/snippets/Tracing.java
index 8f676f5..35bbc34 100644
--- a/docs/_docs/code-snippets/java/src/main/java/org/apache/ignite/snippets/Tracing.java
+++ b/docs/_docs/code-snippets/java/src/main/java/org/apache/ignite/snippets/Tracing.java
@@ -39,7 +39,7 @@ public class Tracing {
ignite.tracingConfiguration().set(
new TracingConfigurationCoordinates.Builder(Scope.TX).build(),
- new TracingConfigurationParameters.Builder().withSamplingRate(0.5).build());
+ new TracingConfigurationParameters.Builder().withSamplingRate(1).build());
//end::enable-sampling[]
ignite.close();
diff --git a/docs/_docs/distributed-computing/cluster-groups.adoc b/docs/_docs/distributed-computing/cluster-groups.adoc
index 70fcb48..0e1cc5a 100644
--- a/docs/_docs/distributed-computing/cluster-groups.adoc
+++ b/docs/_docs/distributed-computing/cluster-groups.adoc
@@ -1,6 +1,6 @@
= Cluster Groups
-:javaFile: {javaCodeDir}/ClusterGroups.java
+:javaFile: {javaCodeDir}/ClusterAPI.java
The `ClusterGroup` interface represents a logical group of nodes, which can be used in many of Ignite's APIs when you want to limit the scope of specific operations to a subset of nodes (instead of the whole cluster). For example, you may wish to deploy a service only on remote nodes or execute a job only on the set of nodes that have a specific attribute.
////
@@ -36,7 +36,7 @@ For convenience, Ignite comes with a number of predefined cluster groups.
tab:Java[]
[source,java]
----
-include::{javaFile}[tag=examples,indent=0]
+include::{javaFile}[tag=group-examples,indent=0]
----
tab:C#/.NET[]
[source,csharp]
diff --git a/docs/_docs/key-value-api/transactions.adoc b/docs/_docs/key-value-api/transactions.adoc
index 44ce0c3..4e4ee30 100644
--- a/docs/_docs/key-value-api/transactions.adoc
+++ b/docs/_docs/key-value-api/transactions.adoc
@@ -311,4 +311,6 @@ tab:C++[unsupported]
Refer to the link:monitoring-metrics/metrics#monitoring-transactions[Monitoring Transactions] section for the list of metrics that expose some transaction-related information.
+For the information on how to trace transactions, refer to the link:monitoring-metrics/tracing[Tracing] section.
+
You can also use the link:control-script#transaction-management[control script] to get information about, or cancel, specific transactions being executed in the cluster.
diff --git a/docs/_docs/monitoring-metrics/tracing.adoc b/docs/_docs/monitoring-metrics/tracing.adoc
index 1208fb0..5db0717 100644
--- a/docs/_docs/monitoring-metrics/tracing.adoc
+++ b/docs/_docs/monitoring-metrics/tracing.adoc
@@ -78,9 +78,11 @@ Enable tracing for a specific API:
[source, shell]
----
-./control.sh --tracing-configuration set --scope DISCOVERY --sampling-rate 1
+./control.sh --tracing-configuration set --scope TX --sampling-rate 1
----
+Refer to the link:control-script#tracing-configuration[Control Script] sections for the list of all parameters.
+
=== Programmatically
Once you start the node, you can enable sampling as follows:
@@ -154,13 +156,14 @@ The commit operation, in turn, consists of two operations: prepare and finish.
You can click on each span to view the annotations and tags attached to it.
-//=== Analyzing Spans
image::images/span.png[Span]
+////
+TODO: describe annotations and tags
=== Annotations
=== Tags
The `node.id` and `node.consistentId` are the ID and consistent ID of the node where the root operation started.
-
+////