Return-Path: X-Original-To: apmail-flink-commits-archive@minotaur.apache.org Delivered-To: apmail-flink-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5E4BB10BD3 for ; Thu, 18 Dec 2014 18:45:28 +0000 (UTC) Received: (qmail 24078 invoked by uid 500); 18 Dec 2014 18:45:28 -0000 Delivered-To: apmail-flink-commits-archive@flink.apache.org Received: (qmail 24050 invoked by uid 500); 18 Dec 2014 18:45:28 -0000 Mailing-List: contact commits-help@flink.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.incubator.apache.org Delivered-To: mailing list commits@flink.incubator.apache.org Received: (qmail 23999 invoked by uid 99); 18 Dec 2014 18:45:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Dec 2014 18:45:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 18 Dec 2014 18:45:24 +0000 Received: (qmail 20368 invoked by uid 99); 18 Dec 2014 18:45:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Dec 2014 18:45:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 28DEC957A20; Thu, 18 Dec 2014 18:45:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: trohrmann@apache.org To: commits@flink.incubator.apache.org Date: Thu, 18 Dec 2014 18:46:03 -0000 Message-Id: <42d96d3ab5d84d87b501d387c5ef869a@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [67/82] [abbrv] incubator-flink git commit: Use container based builds in travis. Enable caching for travis. Set travis fork count to 2. X-Virus-Checked: Checked by ClamAV on apache.org Use container based builds in travis. Enable caching for travis. Set travis fork count to 2. Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/f10d3570 Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/f10d3570 Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/f10d3570 Branch: refs/heads/master Commit: f10d357058e6bbf6555c603c3bb70fd54c8eb234 Parents: 1cd44e0 Author: Till Rohrmann Authored: Thu Dec 11 12:43:35 2014 +0100 Committer: Till Rohrmann Committed: Thu Dec 18 18:58:32 2014 +0100 ---------------------------------------------------------------------- .gitignore | 1 + .travis.yml | 15 ++++++++++----- .../runtime/minicluster/LocalFlinkMiniCluster.scala | 16 +++++++++++----- pom.xml | 3 ++- 4 files changed, 24 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/f10d3570/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index b519d40..0afd000 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ tmp .DS_Store _site docs/api +atlassian-ide-plugin.xml http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/f10d3570/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 7c745e7..af2f082 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,15 @@ # s3 deployment based on http://about.travis-ci.org/blog/2012-12-18-travis-artifacts/ -language: java +# send to container based infrastructure: http://docs.travis-ci.com/user/workers/container-based-infrastructure/ +sudo: false + +cache: + directories: + - $HOME/.m2 + +install: true +language: java #See https://issues.apache.org/jira/browse/FLINK-1072 matrix: @@ -44,12 +52,9 @@ before_script: - "gem install --no-document --version 0.8.9 faraday " - "gem install --no-document travis-artifacts & " - -install: true - # we have to manually set the forkCount because maven thinks that the travis # machine has 32 cores -script: "mvn -Dflink.forkCount=4 -B $PROFILE clean install verify" +script: "mvn -Dflink.forkCount=2 -B $PROFILE clean install verify" # deploy if the first job is successful; should be replaced by an after_all_success if travis finally supports it after_success: http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/f10d3570/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala index 32fdb37..fbf5d83 100644 --- a/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala +++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala @@ -33,6 +33,7 @@ FlinkMiniCluster(userConfiguration){ import LocalFlinkMiniCluster._ val jobClientActorSystem = AkkaUtils.createActorSystem() + var jobClient: Option[ActorRef] = None override def generateConfiguration(userConfiguration: Configuration): Configuration = { val config = getDefaultConfig @@ -72,13 +73,18 @@ FlinkMiniCluster(userConfiguration){ } def getJobClient(): ActorRef ={ - val config = new Configuration() - - config.setString(ConfigConstants.JOB_MANAGER_IPC_ADDRESS_KEY, HOSTNAME) - config.setInteger(ConfigConstants.JOB_MANAGER_IPC_PORT_KEY, getJobManagerRPCPort) + jobClient match { + case Some(jc) => jc + case None => + val config = new Configuration() + config.setString(ConfigConstants.JOB_MANAGER_IPC_ADDRESS_KEY, HOSTNAME) + config.setInteger(ConfigConstants.JOB_MANAGER_IPC_PORT_KEY, getJobManagerRPCPort) - JobClient.startActorWithConfiguration(config)(jobClientActorSystem) + val jc = JobClient.startActorWithConfiguration(config)(jobClientActorSystem) + jobClient = Some(jc) + jc + } } def getJobClientActorSystem: ActorSystem = jobClientActorSystem http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/f10d3570/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6a27cf0..d5a0c0a 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ under the License. - 1C + 1.5C true 1.7.7 17.0 @@ -662,6 +662,7 @@ under the License. **/*.iml flink-quickstart/**/testArtifact/goal.txt + atlassian-ide-plugin.xml **/target/** docs/_site/**