Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 88657200B57 for ; Fri, 1 Jul 2016 14:10:47 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 87431160A61; Fri, 1 Jul 2016 12:10:47 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2A770160A84 for ; Fri, 1 Jul 2016 14:10:46 +0200 (CEST) Received: (qmail 11589 invoked by uid 500); 1 Jul 2016 12:10:45 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 10799 invoked by uid 99); 1 Jul 2016 12:10:45 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Jul 2016 12:10:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E1C53E058E; Fri, 1 Jul 2016 12:10:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Fri, 01 Jul 2016 12:11:08 -0000 Message-Id: <5913b11dc15e4ff2a0550c25628bbb55@git.apache.org> In-Reply-To: <916205a14e4d4e05bf9b06a8a2276d6b@git.apache.org> References: <916205a14e4d4e05bf9b06a8a2276d6b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [25/27] ignite git commit: Merge branch 'gridgain-7.5.29' into ignite-3185 archived-at: Fri, 01 Jul 2016 12:10:47 -0000 Merge branch 'gridgain-7.5.29' into ignite-3185 # Conflicts: # modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopProcessor.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d7aa255a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d7aa255a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d7aa255a Branch: refs/heads/ignite-3185 Commit: d7aa255a32bf336acb36f17d9d07bf5c30b2d79e Parents: 057654a cc7ace9 Author: vozerov-gridgain Authored: Fri Jul 1 15:05:14 2016 +0300 Committer: vozerov-gridgain Committed: Fri Jul 1 15:05:14 2016 +0300 ---------------------------------------------------------------------- bin/include/setenv.bat | 4 +- examples/config/filesystem/example-igfs.xml | 3 - .../ignite/binary/BinaryObjectBuilder.java | 11 + .../apache/ignite/internal/IgniteKernal.java | 53 +- .../ignite/internal/binary/BinaryContext.java | 35 + .../dht/GridDhtPartitionTopologyImpl.java | 2 +- .../processors/hadoop/HadoopNoopProcessor.java | 5 + .../hadoop/HadoopProcessorAdapter.java | 7 + modules/core/src/test/config/igfs-loopback.xml | 7 - modules/core/src/test/config/igfs-shmem.xml | 7 - .../processors/hadoop/HadoopClassLoader.java | 2 +- .../processors/hadoop/HadoopProcessor.java | 52 +- .../query/h2/sql/GridQueryParsingTest.java | 11 +- .../config/benchmark-cache-load-win.properties | 60 + .../config/benchmark-cache-load.properties | 92 ++ .../yardstick/config/benchmark-full.properties | 116 ++ .../config/ignite-base-load-config.xml | 255 ++++ .../config/ignite-cache-load-config.xml | 71 ++ modules/yardstick/config/queries.sql | 2 + .../yardstick/IgniteBenchmarkArguments.java | 50 +- .../org/apache/ignite/yardstick/IgniteNode.java | 2 + .../cache/IgniteCacheAbstractBenchmark.java | 59 + .../yardstick/cache/IgniteGetTxBenchmark.java | 30 + .../yardstick/cache/IgniteInvokeBenchmark.java | 65 + .../cache/IgniteInvokeTxBenchmark.java | 30 + .../IgniteCacheRandomOperationBenchmark.java | 1160 ++++++++++++++++++ .../yardstick/cache/load/model/ModelUtil.java | 181 +++ .../cache/load/model/key/Identifier.java | 113 ++ .../yardstick/cache/load/model/key/Mark.java | 115 ++ .../yardstick/cache/load/model/value/Car.java | 126 ++ .../yardstick/cache/load/model/value/Color.java | 50 + .../yardstick/cache/load/model/value/Truck.java | 69 ++ .../ignite/yardstick/cache/model/Account.java | 6 + .../ignite/yardstick/cache/model/Person1.java | 2 +- .../ignite/yardstick/cache/model/Person2.java | 2 +- .../ignite/yardstick/cache/model/SampleKey.java | 2 +- .../yardstick/cache/model/SampleValue.java | 2 +- parent/pom.xml | 1 + 38 files changed, 2797 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d7aa255a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopProcessor.java ---------------------------------------------------------------------- diff --cc modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopProcessor.java index bbf6e8e,7fc7499..8677c55 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopProcessor.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopProcessor.java @@@ -204,6 -188,26 +189,25 @@@ public class HadoopProcessor extends Ha return hctx.jobTracker().killJob(jobId); } + /** {@inheritDoc} */ + @Override public void validateEnvironment() throws IgniteCheckedException { + // Perform some static checks as early as possible, so that any recoverable exceptions are thrown here. + try { - HadoopLocations loc = HadoopClasspathUtils.hadoopLocations(); ++ HadoopLocations loc = HadoopClasspathUtils.locations(); + - if (loc.home() != null) - U.quietAndInfo(log, "HADOOP_HOME is set to " + loc.home()); ++ if (!F.isEmpty(loc.home())) ++ U.quietAndInfo(log, HadoopClasspathUtils.HOME + " is set to " + loc.home()); + - U.quietAndInfo(log, "HADOOP_COMMON_HOME is set to " + loc.commonHome()); - U.quietAndInfo(log, "HADOOP_HDFS_HOME is set to " + loc.hdfsHome()); - U.quietAndInfo(log, "HADOOP_MAPRED_HOME is set to " + loc.mapredHome()); ++ U.quietAndInfo(log, "Resolved Hadoop classpath locations: " + loc.common() + ", " + loc.hdfs() + ", " + ++ loc.mapred()); + } + catch (IOException ioe) { - throw new IgniteCheckedException(ioe.getMessage(), ioe); ++ throw new IgniteCheckedException(ioe); + } + + HadoopClassLoader.hadoopUrls(); + } + /** * Initializes default hadoop configuration. *