You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/19 20:31:10 UTC
[1/5] incubator-ignite git commit: 1.1.4-SNAPSHOT
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-980 acc2cb944 -> ef4e09b95
1.1.4-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4d9868a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4d9868a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4d9868a0
Branch: refs/heads/ignite-980
Commit: 4d9868a0efd8a55cc7ec4abc9472053bf17c05be
Parents: ad0a026
Author: Ignite Teamcity <ig...@apache.org>
Authored: Fri Jun 19 12:24:27 2015 +0300
Committer: Ignite Teamcity <ig...@apache.org>
Committed: Fri Jun 19 12:24:27 2015 +0300
----------------------------------------------------------------------
examples/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/cloud/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/core/src/main/resources/ignite.properties | 2 +-
modules/extdata/p2p/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 2 +-
modules/gce/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 2 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
modules/jcl/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/mesos/pom.xml | 2 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar-2.10/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spark-2.10/pom.xml | 2 +-
modules/spark/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console-2.10/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
pom.xml | 2 +-
37 files changed, 37 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 8422402..834b5b4 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>ignite-examples</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/aop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index 1119301..e9cc980 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aop</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/aws/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index 3b1f3c6..1d3b1f3 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aws</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/clients/pom.xml
----------------------------------------------------------------------
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index dfde946..6b28630 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-clients</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/cloud/pom.xml
----------------------------------------------------------------------
diff --git a/modules/cloud/pom.xml b/modules/cloud/pom.xml
index b45b503..0c9cd3d 100644
--- a/modules/cloud/pom.xml
+++ b/modules/cloud/pom.xml
@@ -29,7 +29,7 @@
</parent>
<artifactId>ignite-cloud</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<properties>
<jcloud.version>1.9.0</jcloud.version>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/codegen/pom.xml
----------------------------------------------------------------------
diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml
index 94154ea..5b7f518 100644
--- a/modules/codegen/pom.xml
+++ b/modules/codegen/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-codegen</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index b81cc63..d84cef0 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-core</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/core/src/main/resources/ignite.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/ignite.properties b/modules/core/src/main/resources/ignite.properties
index 32d6d1f..1be362f 100644
--- a/modules/core/src/main/resources/ignite.properties
+++ b/modules/core/src/main/resources/ignite.properties
@@ -15,7 +15,7 @@
# limitations under the License.
#
-ignite.version=1.1.3-SNAPSHOT
+ignite.version=1.1.4-SNAPSHOT
ignite.build=0
ignite.revision=DEV
ignite.rel.date=01011970
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/extdata/p2p/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml
index 0ee5e75..d849117 100644
--- a/modules/extdata/p2p/pom.xml
+++ b/modules/extdata/p2p/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-extdata-p2p</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/extdata/uri/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml
index 633df8b..e62738e 100644
--- a/modules/extdata/uri/pom.xml
+++ b/modules/extdata/uri/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-extdata-uri</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/gce/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gce/pom.xml b/modules/gce/pom.xml
index 2da3a6c..ff582bd 100644
--- a/modules/gce/pom.xml
+++ b/modules/gce/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-gce</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/geospatial/pom.xml
----------------------------------------------------------------------
diff --git a/modules/geospatial/pom.xml b/modules/geospatial/pom.xml
index 4f71637..bcad0b0 100644
--- a/modules/geospatial/pom.xml
+++ b/modules/geospatial/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-geospatial</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index ef26445..1884271 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hadoop</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate/pom.xml b/modules/hibernate/pom.xml
index b4da498..dac4b3b 100644
--- a/modules/hibernate/pom.xml
+++ b/modules/hibernate/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hibernate</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index 451e801..91811d2 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-indexing</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/jcl/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml
index 0b0f2a6..d100d4a 100644
--- a/modules/jcl/pom.xml
+++ b/modules/jcl/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jcl</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/jta/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index b4d6a5a..d44f9a8 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jta</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j/pom.xml b/modules/log4j/pom.xml
index 2c5e15e..7cb43cc 100644
--- a/modules/log4j/pom.xml
+++ b/modules/log4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-log4j</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/mesos/pom.xml
----------------------------------------------------------------------
diff --git a/modules/mesos/pom.xml b/modules/mesos/pom.xml
index d718a65..1c44422 100644
--- a/modules/mesos/pom.xml
+++ b/modules/mesos/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-mesos</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<properties>
<jetty.version>9.2.10.v20150310</jetty.version>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/rest-http/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index 18ec434..686a3ce 100644
--- a/modules/rest-http/pom.xml
+++ b/modules/rest-http/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-rest-http</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/scalar-2.10/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar-2.10/pom.xml b/modules/scalar-2.10/pom.xml
index 71c1ec9..2ce2de1 100644
--- a/modules/scalar-2.10/pom.xml
+++ b/modules/scalar-2.10/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-scalar_2.10</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index 635b874..5863f4a 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-scalar</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/schedule/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index 0c73aa0..86d0ab6 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schedule</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml
index 92b9da8..59c5d63 100644
--- a/modules/schema-import/pom.xml
+++ b/modules/schema-import/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schema-import</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index 22f538f..90e7031 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-slf4j</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/spark-2.10/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spark-2.10/pom.xml b/modules/spark-2.10/pom.xml
index 5e5d78e..f664aa0 100644
--- a/modules/spark-2.10/pom.xml
+++ b/modules/spark-2.10/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-spark_2.10</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/spark/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spark/pom.xml b/modules/spark/pom.xml
index 244fa3c..577ae57 100644
--- a/modules/spark/pom.xml
+++ b/modules/spark/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-spark</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index 85f57bb..d43d337 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-spring</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/ssh/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ssh/pom.xml b/modules/ssh/pom.xml
index dcd74d8..3e9ac77 100644
--- a/modules/ssh/pom.xml
+++ b/modules/ssh/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-ssh</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/tools/pom.xml
----------------------------------------------------------------------
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index 41e4f8a..7b07260 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-tools</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/urideploy/pom.xml
----------------------------------------------------------------------
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index 7970f4b..5d7bf4c 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-urideploy</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/visor-console-2.10/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console-2.10/pom.xml b/modules/visor-console-2.10/pom.xml
index f5116bd..c3d9045 100644
--- a/modules/visor-console-2.10/pom.xml
+++ b/modules/visor-console-2.10/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-console_2.10</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/visor-console/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index 885afe1..f8627da 100644
--- a/modules/visor-console/pom.xml
+++ b/modules/visor-console/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-console</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/visor-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml
index 51680fa..dd5cbe0 100644
--- a/modules/visor-plugins/pom.xml
+++ b/modules/visor-plugins/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-plugins</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<!-- Ignite dependencies -->
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index 97901ba..4e8a50f 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-web</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/modules/yardstick/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index c4cb122..84a8336 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-yardstick</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<properties>
<yardstick.version>0.7.0</yardstick.version>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d9868a0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 84e1c79..64f9e25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<groupId>org.apache.ignite</groupId>
<artifactId>apache-ignite</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
[4/5] incubator-ignite git commit: # IG-980: implemenmted 1 job class
loader per node variant.
Posted by sb...@apache.org.
# IG-980: implemenmted 1 job class loader per node variant.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5285b72c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5285b72c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5285b72c
Branch: refs/heads/ignite-980
Commit: 5285b72c3341eebb555a3562d0395459b654fe94
Parents: acc2cb9
Author: iveselovskiy <iv...@gridgain.com>
Authored: Fri Jun 19 21:30:23 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Fri Jun 19 21:30:23 2015 +0300
----------------------------------------------------------------------
.../processors/hadoop/HadoopJobInfo.java | 3 +-
.../fs/IgniteHadoopFileSystemCounterWriter.java | 3 +-
.../processors/hadoop/HadoopDefaultJobInfo.java | 57 +++++++++++----
.../internal/processors/hadoop/HadoopUtils.java | 77 ++++++++------------
.../hadoop/jobtracker/HadoopJobTracker.java | 5 +-
.../child/HadoopChildProcessRunner.java | 5 +-
.../processors/hadoop/v2/HadoopV2Job.java | 65 ++++++++++++-----
.../hadoop/v2/HadoopV2JobResourceManager.java | 7 +-
.../hadoop/v2/HadoopV2TaskContext.java | 2 +-
.../processors/hadoop/HadoopTasksV1Test.java | 6 +-
.../processors/hadoop/HadoopTasksV2Test.java | 6 +-
.../processors/hadoop/HadoopV2JobSelfTest.java | 6 +-
.../collections/HadoopAbstractMapTest.java | 2 +-
13 files changed, 144 insertions(+), 100 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5285b72c/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java
index 51faf5d..e676cbd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java
@@ -21,6 +21,7 @@ import org.apache.ignite.*;
import org.jetbrains.annotations.*;
import java.io.*;
+import java.util.*;
/**
* Compact job description.
@@ -60,7 +61,7 @@ public interface HadoopJobInfo extends Serializable {
* @return Job.
* @throws IgniteCheckedException If failed.
*/
- HadoopJob createJob(HadoopJobId jobId, IgniteLogger log) throws IgniteCheckedException;
+ public HadoopJob createJob(UUID localNodeId, HadoopJobId jobId, IgniteLogger log) throws IgniteCheckedException;
/**
* @return Number of reducers configured for job.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5285b72c/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopFileSystemCounterWriter.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopFileSystemCounterWriter.java b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopFileSystemCounterWriter.java
index 420cece..597ff8a 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopFileSystemCounterWriter.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopFileSystemCounterWriter.java
@@ -72,8 +72,7 @@ public class IgniteHadoopFileSystemCounterWriter implements HadoopCounterWriter
try {
hadoopCfg.set(MRJobConfig.USER_NAME, user);
- FileSystem fs = HadoopUtils.fileSystemForMrUser(jobStatPath.toUri(), hadoopCfg,
- jobId.toString(), null);
+ FileSystem fs = HadoopUtils.fileSystemForMrUser(jobStatPath.toUri(), hadoopCfg, jobId);
fs.mkdirs(jobStatPath);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5285b72c/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultJobInfo.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultJobInfo.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultJobInfo.java
index 2e855d0..9e685ea 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultJobInfo.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultJobInfo.java
@@ -18,13 +18,17 @@
package org.apache.ignite.internal.processors.hadoop;
import org.apache.ignite.*;
+import org.apache.ignite.internal.processors.hadoop.fs.*;
import org.apache.ignite.internal.processors.hadoop.v2.*;
+import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.jetbrains.annotations.*;
+import org.jsr166.*;
import java.io.*;
import java.lang.reflect.*;
import java.util.*;
+import java.util.concurrent.*;
/**
* Hadoop job info based on default Hadoop configuration.
@@ -49,7 +53,38 @@ public class HadoopDefaultJobInfo implements HadoopJobInfo, Externalizable {
private String user;
/** */
- private static volatile Class<?> jobCls;
+ private static class CloseableClass implements Closeable {
+ private final Class<?> clazz;
+
+ CloseableClass(Class<?> c) {
+ clazz = c;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void close() {
+ // Noop
+ }
+
+ public Class<?> clazz() {
+ return clazz;
+ }
+ }
+
+ /** */
+ private static final HadoopLazyConcurrentMap<UUID, CloseableClass> hadoopV2JobClasses =
+ new HadoopLazyConcurrentMap<>(new HadoopLazyConcurrentMap.ValueFactory<UUID, CloseableClass>() {
+ @Override public CloseableClass createValue(UUID key) {
+ HadoopClassLoader ldr = new HadoopClassLoader(null, "hadoop-job-node-" + key);
+
+ try {
+ Class<?> jobCls = ldr.loadClass(HadoopV2Job.class.getName());
+
+ return new CloseableClass(jobCls);
+ } catch (Exception ioe) {
+ throw new IgniteException(ioe);
+ }
+ }
+ });
/**
* Default constructor required by {@link Externalizable}.
@@ -82,24 +117,16 @@ public class HadoopDefaultJobInfo implements HadoopJobInfo, Externalizable {
}
/** {@inheritDoc} */
- @Override public HadoopJob createJob(HadoopJobId jobId, IgniteLogger log) throws IgniteCheckedException {
+ @Override public HadoopJob createJob(UUID nodeId, HadoopJobId jobId, IgniteLogger log) throws IgniteCheckedException {
try {
- Class<?> jobCls0 = jobCls;
-
- if (jobCls0 == null) { // It is enough to have only one class loader with only Hadoop classes.
- synchronized (HadoopDefaultJobInfo.class) {
- if ((jobCls0 = jobCls) == null) {
- HadoopClassLoader ldr = new HadoopClassLoader(null, "hadoop-job");
+ Class<?> jobCls0 = hadoopV2JobClasses.getOrCreate(nodeId).clazz();
- jobCls = jobCls0 = ldr.loadClass(HadoopV2Job.class.getName());
- }
- }
- }
+ X.println("#### Creating job: HadoopJob: " + nodeId + ", class = " + jobCls0);
- Constructor<?> constructor = jobCls0.getConstructor(HadoopJobId.class, HadoopDefaultJobInfo.class,
- IgniteLogger.class);
+ Constructor<?> constructor = jobCls0.getConstructor(HadoopJobId.class, UUID.class,
+ HadoopDefaultJobInfo.class, IgniteLogger.class);
- return (HadoopJob)constructor.newInstance(jobId, this, log);
+ return (HadoopJob)constructor.newInstance(jobId, nodeId, this, log);
}
// NB: java.lang.NoClassDefFoundError may be thrown from Class#getConstructor() call.
catch (Throwable t) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5285b72c/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopUtils.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopUtils.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopUtils.java
index f50f0b3..2234549 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopUtils.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopUtils.java
@@ -33,10 +33,12 @@ import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.jetbrains.annotations.*;
+import org.jsr166.*;
import java.io.*;
import java.net.*;
import java.util.*;
+import java.util.concurrent.*;
/**
* Hadoop utility methods.
@@ -68,8 +70,8 @@ public class HadoopUtils {
= createHadoopLazyConcurrentMap();
/** File system cache for jobs. */
- private static final Map<String, T2<HadoopLazyConcurrentMap<FsCacheKey,FileSystem>, Set<String>>> jobFsMap
- = new HashMap<>(16);
+ private static final ConcurrentMap<HadoopJobId, HadoopLazyConcurrentMap<FsCacheKey,FileSystem>> jobFsMap
+ = new ConcurrentHashMap8<>();
/**
* Creates HadoopLazyConcurrentMap.
@@ -414,8 +416,8 @@ public class HadoopUtils {
* @return the file system
* @throws IOException
*/
- public static FileSystem fileSystemForMrUser(@Nullable URI uri, Configuration cfg,
- @Nullable String jobId, @Nullable String locId) throws IOException {
+ public static FileSystem fileSystemForMrUser(@Nullable URI uri, Configuration cfg, @Nullable HadoopJobId jobId)
+ throws IOException {
final String usr = getMrHadoopUser(cfg);
assert usr != null;
@@ -426,7 +428,7 @@ public class HadoopUtils {
final FileSystem fs;
try {
- fs = getWithCaching(uri, cfg, usr, jobId, locId);
+ fs = getWithCaching(uri, cfg, usr, jobId);
}
catch (IgniteException ie) {
throw new IOException(ie);
@@ -545,14 +547,13 @@ public class HadoopUtils {
* @param usr The user to create file system for.
* @return The file system: either created, or taken from the cache.
*/
- private static FileSystem getWithCaching(URI uri, Configuration cfg, String usr,
- @Nullable String jobId, @Nullable String locId) {
+ private static FileSystem getWithCaching(URI uri, Configuration cfg, String usr, @Nullable HadoopJobId jobId) {
final FsCacheKey key = new FsCacheKey(uri, usr, cfg);
if (jobId == null)
return fileSysLazyMap.getOrCreate(key);
else {
- HadoopLazyConcurrentMap<FsCacheKey,FileSystem> lm = getFsMapForJob(jobId, locId);
+ HadoopLazyConcurrentMap<FsCacheKey,FileSystem> lm = getFsMapForJob(jobId);
return lm.getOrCreate(key);
}
@@ -562,67 +563,47 @@ public class HadoopUtils {
* Gets Fs map for given job Id and localNodeId. If local node Id not null, registers this
* local node id to track subsequent removal.
* @param jobId The job Id.
- * @param locId The local node id.
* @return File system map.
*/
- private static synchronized HadoopLazyConcurrentMap<FsCacheKey,FileSystem> getFsMapForJob(String jobId,
- @Nullable String locId) {
+ private static HadoopLazyConcurrentMap<FsCacheKey,FileSystem> getFsMapForJob(final HadoopJobId jobId) {
assert jobId != null;
- T2<HadoopLazyConcurrentMap<FsCacheKey, FileSystem>, Set<String>> t2 = jobFsMap.get(jobId);
+ HadoopLazyConcurrentMap<FsCacheKey, FileSystem> lazy = jobFsMap.get(jobId);
- if (t2 == null) {
- HadoopLazyConcurrentMap<FsCacheKey, FileSystem> newLM = createHadoopLazyConcurrentMap();
+ if (lazy != null)
+ return lazy;
- t2 = new T2<>(newLM, (Set<String>)new HashSet<String>());
+ HadoopLazyConcurrentMap<FsCacheKey, FileSystem> newLM = createHadoopLazyConcurrentMap();
- T2<HadoopLazyConcurrentMap<FsCacheKey, FileSystem>, Set<String>> pushedT2 = jobFsMap.put(jobId, t2);
+ HadoopLazyConcurrentMap<FsCacheKey, FileSystem> pushedT2 = jobFsMap.putIfAbsent(jobId, newLM);
- assert pushedT2 == null;
- }
-
- if (locId != null) {
- // If local node Id is given, register this local Id for this job:
- boolean added = t2.get2().add(locId);
+ if (pushedT2 == null)
+ lazy = newLM;
+ else {
+ lazy = pushedT2;
- // new locId appears in HadoopV2Job#initialize(), no job with the same locId should be registered:
- assert added;
+ try {
+ newLM.close();
+ } catch (IgniteCheckedException ice) {
+ throw new IgniteException(ice);
+ }
}
- return t2.get1();
+ return lazy;
}
/**
* Closes file system map for this job Id and local node id.
* @param jobId The job id.
- * @param locId The local node id.
* @throws IgniteCheckedException
*/
- public static synchronized void close(final String jobId, final String locId) throws IgniteCheckedException {
+ public static synchronized void close(final HadoopJobId jobId) throws IgniteCheckedException {
assert jobId != null;
- assert locId != null;
-
- final T2<HadoopLazyConcurrentMap<FsCacheKey, FileSystem>, Set<String>> t2 = jobFsMap.get(jobId);
-
- if (t2 != null) {
- Set<String> locIds = t2.get2();
-
- boolean rm = locIds.remove(locId);
- assert rm;
+ final HadoopLazyConcurrentMap<FsCacheKey, FileSystem> lazy = jobFsMap.remove(jobId);
- final int usageCnt = locIds.size();
-
- assert usageCnt >= 0 : "negative usage count " + usageCnt + ", map: " + t2.get1();
-
- if (usageCnt == 0) {
- T2<HadoopLazyConcurrentMap<FsCacheKey, FileSystem>, Set<String>> rmT2 = jobFsMap.remove(jobId);
-
- assert rmT2 == t2;
-
- t2.get1().close();
- }
- }
+ if (lazy != null)
+ lazy.close();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5285b72c/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java
index 2f07817..b7377d4 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java
@@ -224,6 +224,7 @@ public class HadoopJobTracker extends HadoopComponent {
// Fail all pending futures.
for (GridFutureAdapter<HadoopJobId> fut : activeFinishFuts.values())
fut.onDone(new IgniteCheckedException("Failed to execute Hadoop map-reduce job (grid is stopping)."));
+
}
/**
@@ -986,7 +987,9 @@ public class HadoopJobTracker extends HadoopComponent {
jobInfo = meta.jobInfo();
}
- job = jobInfo.createJob(jobId, log);
+ UUID nodeId = ctx.localNodeId();
+
+ job = jobInfo.createJob(nodeId, jobId, log);
job.initialize(false, ctx.localNodeId());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5285b72c/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/HadoopChildProcessRunner.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/HadoopChildProcessRunner.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/HadoopChildProcessRunner.java
index 040552a..cfa393e 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/HadoopChildProcessRunner.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/HadoopChildProcessRunner.java
@@ -31,6 +31,7 @@ import org.apache.ignite.internal.util.offheap.unsafe.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
+import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
@@ -115,7 +116,9 @@ public class HadoopChildProcessRunner {
assert job == null;
- job = req.jobInfo().createJob(req.jobId(), log);
+ UUID nodeId = nodeDesc.parentNodeId();
+
+ job = req.jobInfo().createJob(nodeId, req.jobId(), log);
job.initialize(true, nodeDesc.processId());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5285b72c/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2Job.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2Job.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2Job.java
index f48db98..6e957df 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2Job.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2Job.java
@@ -74,7 +74,7 @@ public class HadoopV2Job implements HadoopJob {
private final Queue<Class<?>> fullCtxClsQueue = new ConcurrentLinkedDeque<>();
/** Local node ID */
- private volatile UUID locNodeId;
+ private final UUID locNodeId;
/** Serialized JobConf. */
private volatile byte[] jobConfData;
@@ -87,12 +87,18 @@ public class HadoopV2Job implements HadoopJob {
* @param jobInfo Job info.
* @param log Logger.
*/
- public HadoopV2Job(HadoopJobId jobId, final HadoopDefaultJobInfo jobInfo, IgniteLogger log) {
+ public HadoopV2Job(HadoopJobId jobId, UUID locNodeId, final HadoopDefaultJobInfo jobInfo, IgniteLogger log) {
assert jobId != null;
+ assert locNodeId != null;
assert jobInfo != null;
this.jobId = jobId;
this.jobInfo = jobInfo;
+ this.locNodeId = locNodeId;
+
+ // TODO: debug:
+ assert getClass().getClassLoader() instanceof HadoopClassLoader;
+ assert getClass().getClassLoader().toString().contains(locNodeId.toString());
hadoopJobID = new JobID(jobId.globalId().toString(), jobId.localId());
@@ -138,7 +144,7 @@ public class HadoopV2Job implements HadoopJob {
Path jobDir = new Path(jobDirPath);
try {
- FileSystem fs = fileSystemForMrUser(jobDir.toUri(), jobConf, jobId.toString(), null);
+ FileSystem fs = fileSystemForMrUser(jobDir.toUri(), jobConf, jobId);
JobSplit.TaskSplitMetaInfo[] metaInfos = SplitMetaInfoReader.readSplitMetaInfo(hadoopJobID, fs, jobConf,
jobDir);
@@ -248,17 +254,15 @@ public class HadoopV2Job implements HadoopJob {
/** {@inheritDoc} */
@Override public void initialize(boolean external, UUID locNodeId) throws IgniteCheckedException {
assert locNodeId != null;
- assert this.locNodeId == null;
-
- this.locNodeId = locNodeId;
+ assert this.locNodeId.equals(locNodeId);
Thread.currentThread().setContextClassLoader(jobConf.getClassLoader());
- try {
- HadoopUtils.fileSystemForMrUser(null, jobConf, jobId.toString(), this.locNodeId.toString());
- } catch (IOException ioe) {
- throw new IgniteCheckedException(ioe);
- }
+// try {
+// HadoopUtils.fileSystemForMrUser(null, jobConf);
+// } catch (IOException ioe) {
+// throw new IgniteCheckedException(ioe);
+// }
try {
rsrcMgr.prepareJobEnvironment(!external, jobLocalDir(locNodeId, jobId));
@@ -273,6 +277,8 @@ public class HadoopV2Job implements HadoopJob {
@Override public void dispose(boolean external) throws IgniteCheckedException {
boolean dsp = disposed.compareAndSet(false, true);
+ X.println("###### Dispose: " + locNodeId + ", ldr = " + getClass().getClassLoader());
+
if (!dsp)
return;
@@ -300,11 +306,8 @@ public class HadoopV2Job implements HadoopJob {
try {
final ClassLoader ldr = cls.getClassLoader();
- Class<?> daemonCls = ldr.loadClass(HadoopClassLoader.HADOOP_DAEMON_CLASS_NAME);
-
- Method m = daemonCls.getMethod("dequeueAndStopAll");
-
- m.invoke(null);
+ // Stop Hadoop daemons for this *task*:
+ stopHadoopFsDaemons(ldr);
// Also close all the FileSystems cached in
// HadoopLazyConcurrentMap for this *task* class loader:
@@ -322,25 +325,47 @@ public class HadoopV2Job implements HadoopJob {
assert fullCtxClsQueue.isEmpty();
// Close all cached Fs for this Job:
- HadoopUtils.close(jobId.toString(), locNodeId.toString());
+ //HadoopUtils.close(jobId.toString(), locNodeId.toString());
+ //closeCachedFileSystems(getClass().getClassLoader());
+ HadoopUtils.close(jobId);
- int i = 0;
- while (i++ < 5)
- System.gc();
+ invokeGc();
if (err != null)
throw U.cast(err);
}
}
+ // TODO: remove
+ private void invokeGc() {
+ int i = 0;
+
+ while (i++ < 5)
+ System.gc();
+ }
+
/** {@inheritDoc} */
@Override protected void finalize() throws Throwable {
super.finalize();
+ // TODO: remove
dispose(false);
}
/**
+ * Stops Hadoop Fs daemon threads.
+ * @param ldr The task ClassLoader to stop the daemons for.
+ * @throws Exception On error.
+ */
+ private void stopHadoopFsDaemons(ClassLoader ldr) throws Exception {
+ Class<?> daemonCls = ldr.loadClass(HadoopClassLoader.HADOOP_DAEMON_CLASS_NAME);
+
+ Method m = daemonCls.getMethod("dequeueAndStopAll");
+
+ m.invoke(null);
+ }
+
+ /**
* Closes all the file systems user by task
* @param ldr The task class loader.
* @throws Exception On error.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5285b72c/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2JobResourceManager.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2JobResourceManager.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2JobResourceManager.java
index 7d13fe9..b86f16d 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2JobResourceManager.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2JobResourceManager.java
@@ -115,7 +115,7 @@ public class HadoopV2JobResourceManager {
stagingDir = new Path(new URI(mrDir));
if (download) {
- FileSystem fs = HadoopUtils.fileSystemForMrUser(stagingDir.toUri(), cfg, jobId.toString(), null);
+ FileSystem fs = HadoopUtils.fileSystemForMrUser(stagingDir.toUri(), cfg, jobId);
if (!fs.exists(stagingDir))
throw new IgniteCheckedException("Failed to find map-reduce submission " +
@@ -210,7 +210,7 @@ public class HadoopV2JobResourceManager {
FileSystem dstFs = FileSystem.getLocal(cfg);
- FileSystem srcFs = HadoopUtils.fileSystemForMrUser(srcPath.toUri(), cfg, jobId.toString(), null);
+ FileSystem srcFs = HadoopUtils.fileSystemForMrUser(srcPath.toUri(), cfg, jobId);
if (extract) {
File archivesPath = new File(jobLocDir.getAbsolutePath(), ".cached-archives");
@@ -293,8 +293,7 @@ public class HadoopV2JobResourceManager {
public void cleanupStagingDirectory() {
try {
if (stagingDir != null) {
- FileSystem fs = HadoopUtils.fileSystemForMrUser(stagingDir.toUri(), ctx.getJobConf(),
- jobId.toString(), null);
+ FileSystem fs = HadoopUtils.fileSystemForMrUser(stagingDir.toUri(), ctx.getJobConf(), jobId);
fs.delete(stagingDir, true);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5285b72c/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2TaskContext.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2TaskContext.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2TaskContext.java
index 3452678..7012566 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2TaskContext.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2TaskContext.java
@@ -428,7 +428,7 @@ public class HadoopV2TaskContext extends HadoopTaskContext {
try {
// Task class loader.
// We also cache Fs there, all them will be cleared explicitly upon the Job end.
- fs = fileSystemForMrUser(jobDir.toUri(), jobConf(), null, null);
+ fs = fileSystemForMrUser(jobDir.toUri(), jobConf(), null);
}
catch (IOException e) {
throw new IgniteCheckedException(e);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5285b72c/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopTasksV1Test.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopTasksV1Test.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopTasksV1Test.java
index 48e83cc..93707fe 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopTasksV1Test.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopTasksV1Test.java
@@ -44,9 +44,11 @@ public class HadoopTasksV1Test extends HadoopTasksAllVersionsTest {
HadoopDefaultJobInfo jobInfo = createJobInfo(jobConf);
- HadoopJobId jobId = new HadoopJobId(new UUID(0, 0), 0);
+ UUID uuid = new UUID(0, 0);
- return jobInfo.createJob(jobId, log);
+ HadoopJobId jobId = new HadoopJobId(uuid, 0);
+
+ return jobInfo.createJob(uuid, jobId, log);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5285b72c/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopTasksV2Test.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopTasksV2Test.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopTasksV2Test.java
index e73fae3..bd4c343 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopTasksV2Test.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopTasksV2Test.java
@@ -62,9 +62,11 @@ public class HadoopTasksV2Test extends HadoopTasksAllVersionsTest {
HadoopDefaultJobInfo jobInfo = createJobInfo(hadoopJob.getConfiguration());
- HadoopJobId jobId = new HadoopJobId(new UUID(0, 0), 0);
+ UUID uuid = new UUID(0, 0);
- return jobInfo.createJob(jobId, log);
+ HadoopJobId jobId = new HadoopJobId(uuid, 0);
+
+ return jobInfo.createJob(uuid, jobId, log);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5285b72c/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopV2JobSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopV2JobSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopV2JobSelfTest.java
index f3b9307..a9fd2c9 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopV2JobSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopV2JobSelfTest.java
@@ -68,9 +68,11 @@ public class HadoopV2JobSelfTest extends HadoopAbstractSelfTest {
HadoopDefaultJobInfo info = createJobInfo(cfg);
- HadoopJobId id = new HadoopJobId(UUID.randomUUID(), 1);
+ final UUID uuid = UUID.randomUUID();
- HadoopJob job = info.createJob(id, log);
+ HadoopJobId id = new HadoopJobId(uuid, 1);
+
+ HadoopJob job = info.createJob(uuid, id, log);
HadoopTaskContext taskCtx = job.getTaskContext(new HadoopTaskInfo(HadoopTaskType.MAP, null, 0, 0,
null));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5285b72c/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopAbstractMapTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopAbstractMapTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopAbstractMapTest.java
index 9395c5e..12b6611 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopAbstractMapTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/HadoopAbstractMapTest.java
@@ -136,7 +136,7 @@ public abstract class HadoopAbstractMapTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public HadoopJob createJob(HadoopJobId jobId, IgniteLogger log) throws IgniteCheckedException {
+ @Override public HadoopJob createJob(UUID localNodeId, HadoopJobId jobId, IgniteLogger log) throws IgniteCheckedException {
assert false;
return null;
[5/5] incubator-ignite git commit: Merge branch 'ignite-sprint-7' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-980
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-980
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ef4e09b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ef4e09b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ef4e09b9
Branch: refs/heads/ignite-980
Commit: ef4e09b95da903dda4557687e2fc38f024a43fb6
Parents: 5285b72 ec9cfca
Author: iveselovskiy <iv...@gridgain.com>
Authored: Fri Jun 19 21:30:43 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Fri Jun 19 21:30:43 2015 +0300
----------------------------------------------------------------------
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 44 ++++++++++++++++++--
1 file changed, 41 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[3/5] incubator-ignite git commit: Merge branch 'ignite-sprint-6'
into ignite-sprint-7
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-6' into ignite-sprint-7
Conflicts:
examples/pom.xml
modules/aop/pom.xml
modules/aws/pom.xml
modules/clients/pom.xml
modules/cloud/pom.xml
modules/codegen/pom.xml
modules/core/pom.xml
modules/core/src/main/resources/ignite.properties
modules/extdata/p2p/pom.xml
modules/extdata/uri/pom.xml
modules/gce/pom.xml
modules/geospatial/pom.xml
modules/hadoop/pom.xml
modules/hibernate/pom.xml
modules/indexing/pom.xml
modules/jcl/pom.xml
modules/jta/pom.xml
modules/log4j/pom.xml
modules/mesos/pom.xml
modules/rest-http/pom.xml
modules/scalar-2.10/pom.xml
modules/scalar/pom.xml
modules/schedule/pom.xml
modules/schema-import/pom.xml
modules/slf4j/pom.xml
modules/spark-2.10/pom.xml
modules/spark/pom.xml
modules/spring/pom.xml
modules/ssh/pom.xml
modules/tools/pom.xml
modules/urideploy/pom.xml
modules/visor-console-2.10/pom.xml
modules/visor-console/pom.xml
modules/visor-plugins/pom.xml
modules/web/pom.xml
modules/yardstick/pom.xml
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ec9cfcaf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ec9cfcaf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ec9cfcaf
Branch: refs/heads/ignite-980
Commit: ec9cfcaf8b245be6fe4723b1e2d08526d3a6d4cb
Parents: 8fa9d3d d699faa
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Jun 19 15:32:21 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Jun 19 15:32:21 2015 +0300
----------------------------------------------------------------------
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 44 ++++++++++++++++++--
1 file changed, 41 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/5] incubator-ignite git commit: # ignite-sprint-6 added test for
lastSuccessfulAddress
Posted by sb...@apache.org.
# ignite-sprint-6 added test for lastSuccessfulAddress
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d699faa3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d699faa3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d699faa3
Branch: refs/heads/ignite-980
Commit: d699faa34d66b8e5f1487daf3386c4d677d8c1e5
Parents: 4d9868a
Author: sboikov <sb...@gridgain.com>
Authored: Fri Jun 19 13:01:51 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Jun 19 13:01:51 2015 +0300
----------------------------------------------------------------------
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 44 ++++++++++++++++++--
1 file changed, 41 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d699faa3/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
index ad12753..9a44c24 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
@@ -149,9 +149,47 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest {
*/
public void testThreeNodesStartStop() throws Exception {
try {
- startGrid(1);
- startGrid(2);
- startGrid(3);
+ IgniteEx ignite1 = startGrid(1);
+ IgniteEx ignite2 = startGrid(2);
+ IgniteEx ignite3 = startGrid(3);
+
+ TcpDiscoverySpi spi1 = (TcpDiscoverySpi)ignite1.configuration().getDiscoverySpi();
+ TcpDiscoverySpi spi2 = (TcpDiscoverySpi)ignite2.configuration().getDiscoverySpi();
+ TcpDiscoverySpi spi3 = (TcpDiscoverySpi)ignite3.configuration().getDiscoverySpi();
+
+ TcpDiscoveryNode node = (TcpDiscoveryNode)spi1.getNode(ignite2.localNode().id());
+
+ assertNotNull(node);
+ assertNotNull(node.lastSuccessfulAddress());
+
+ LinkedHashSet<InetSocketAddress> addrs = spi1.getNodeAddresses(node);
+
+ assertEquals(addrs.iterator().next(), node.lastSuccessfulAddress());
+
+ assertTrue(spi1.pingNode(ignite3.localNode().id()));
+
+ node = (TcpDiscoveryNode)spi1.getNode(ignite3.localNode().id());
+
+ assertNotNull(node);
+ assertNotNull(node.lastSuccessfulAddress());
+
+ addrs = spi1.getNodeAddresses(node);
+ assertEquals(addrs.iterator().next(), node.lastSuccessfulAddress());
+
+ node = (TcpDiscoveryNode)spi2.getNode(ignite1.localNode().id());
+
+ assertNotNull(node);
+ assertNotNull(node.lastSuccessfulAddress());
+
+ node = (TcpDiscoveryNode)spi2.getNode(ignite3.localNode().id());
+
+ assertNotNull(node);
+ assertNotNull(node.lastSuccessfulAddress());
+
+ node = (TcpDiscoveryNode)spi3.getNode(ignite1.localNode().id());
+
+ assertNotNull(node);
+ assertNotNull(node.lastSuccessfulAddress());
}
finally {
stopAllGrids();