Menu
▾
▴
bigdata-commit — Commit traffic.
This list is closed, nobody may subscribe to it.
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(139) |
Aug
(94) |
Sep
(232) |
Oct
(143) |
Nov
(138) |
Dec
(55) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2011 |
Jan
(127) |
Feb
(90) |
Mar
(101) |
Apr
(74) |
May
(148) |
Jun
(241) |
Jul
(169) |
Aug
(121) |
Sep
(157) |
Oct
(199) |
Nov
(281) |
Dec
(75) |
| 2012 |
Jan
(107) |
Feb
(122) |
Mar
(184) |
Apr
(73) |
May
(14) |
Jun
(49) |
Jul
(26) |
Aug
(103) |
Sep
(133) |
Oct
(61) |
Nov
(51) |
Dec
(55) |
| 2013 |
Jan
(59) |
Feb
(72) |
Mar
(99) |
Apr
(62) |
May
(92) |
Jun
(19) |
Jul
(31) |
Aug
(138) |
Sep
(47) |
Oct
(83) |
Nov
(95) |
Dec
(111) |
| 2014 |
Jan
(125) |
Feb
(60) |
Mar
(119) |
Apr
(136) |
May
(270) |
Jun
(83) |
Jul
(88) |
Aug
(30) |
Sep
(47) |
Oct
(27) |
Nov
(23) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
(4) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <tho...@us...> - 2014-05-20 17:11:05
|
Revision: 8384
http://sourceforge.net/p/bigdata/code/8384
Author: thompsonbry
Date: 2014-05-20 17:11:01 +0000 (Tue, 20 May 2014)
Log Message:
-----------
added in commented out loggers for jetty to the HA logging configuration.
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/src/resources/HAJournal/log4jHA.properties
Modified: branches/BIGDATA_RELEASE_1_3_0/src/resources/HAJournal/log4jHA.properties
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/src/resources/HAJournal/log4jHA.properties 2014-05-20 17:02:02 UTC (rev 8383)
+++ branches/BIGDATA_RELEASE_1_3_0/src/resources/HAJournal/log4jHA.properties 2014-05-20 17:11:01 UTC (rev 8384)
@@ -18,8 +18,10 @@
log4j.logger.com.bigdata.rdf.sail.webapp.NanoSparqlServer=INFO
-# This will only work if you have the slf4j bridge setup.
-#log4j.org.eclipse.jetty.util.log.Log=INFO
+# jetty debug logging.
+#log4j.logger.org.eclipse.jetty=INFO
+#log4j.logger.org.eclipse.jetty.client=DEBUG
+#log4j.logger.org.eclipse.jetty.proxy=DEBUG
# This can provide valuable information about open connections.
log4j.logger.com.bigdata.txLog=INFO
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2014-05-20 17:02:06
|
Revision: 8383
http://sourceforge.net/p/bigdata/code/8383
Author: thompsonbry
Date: 2014-05-20 17:02:02 +0000 (Tue, 20 May 2014)
Log Message:
-----------
organized imports.
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/TestMROWTransactionsNoHistory.java
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/TestMROWTransactionsNoHistory.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/TestMROWTransactionsNoHistory.java 2014-05-20 15:18:57 UTC (rev 8382)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/TestMROWTransactionsNoHistory.java 2014-05-20 17:02:02 UTC (rev 8383)
@@ -1,32 +1,7 @@
package com.bigdata.rdf.sail;
-import java.util.Properties;
import java.util.Random;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-
-import com.bigdata.counters.CAT;
-import com.bigdata.journal.BufferMode;
-import com.bigdata.journal.ITx;
-import com.bigdata.journal.Journal;
-import com.bigdata.rdf.axioms.NoAxioms;
-import com.bigdata.rdf.sail.BigdataSail.Options;
-import com.bigdata.rdf.store.AbstractTripleStore;
-import com.bigdata.rdf.store.BD;
-import com.bigdata.rdf.store.BigdataStatementIterator;
-import com.bigdata.rdf.vocab.NoVocabulary;
-import com.bigdata.service.AbstractTransactionService;
-import com.bigdata.util.InnerCause;
-import com.bigdata.util.PseudoRandom;
-import com.bigdata.util.concurrent.DaemonThreadFactory;
-
/**
* TestCase to test single writer/mutiple transaction committed readers with
* SAIL interface.
@@ -49,10 +24,12 @@
super(arg0);
}
+ @Override
protected void setUp() throws Exception {
super.setUp();
}
+ @Override
protected void tearDown() throws Exception {
super.tearDown();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2014-05-20 15:19:00
|
Revision: 8382
http://sourceforge.net/p/bigdata/code/8382
Author: thompsonbry
Date: 2014-05-20 15:18:57 +0000 (Tue, 20 May 2014)
Log Message:
-----------
turning on snapshot in CI builds again.
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/build.properties
Modified: branches/BIGDATA_RELEASE_1_3_0/build.properties
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/build.properties 2014-05-20 15:13:41 UTC (rev 8381)
+++ branches/BIGDATA_RELEASE_1_3_0/build.properties 2014-05-20 15:18:57 UTC (rev 8382)
@@ -96,7 +96,7 @@
# Set true to do a snapshot build. This changes the value of ${version} to
# include the date.
-snapshot=false
+snapshot=true
# Javadoc build may be disabled using this property. The javadoc target will
# not be executed unless this property is defined (its value does not matter).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2014-05-20 15:13:43
|
Revision: 8381
http://sourceforge.net/p/bigdata/code/8381
Author: thompsonbry
Date: 2014-05-20 15:13:41 +0000 (Tue, 20 May 2014)
Log Message:
-----------
Bumped the version in pom.xml to resume snapshot releases in CI builds.
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/pom.xml
Modified: branches/BIGDATA_RELEASE_1_3_0/pom.xml
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/pom.xml 2014-05-20 14:46:29 UTC (rev 8380)
+++ branches/BIGDATA_RELEASE_1_3_0/pom.xml 2014-05-20 15:13:41 UTC (rev 8381)
@@ -52,7 +52,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.bigdata</groupId>
<artifactId>bigdata</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>bigdata(R)</name>
<description>Bigdata(R) Maven Build</description>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dme...@us...> - 2014-05-20 14:46:32
|
Revision: 8380
http://sourceforge.net/p/bigdata/code/8380
Author: dmekonnen
Date: 2014-05-20 14:46:29 +0000 (Tue, 20 May 2014)
Log Message:
-----------
Brew formula update as per latest feedback. Vagrant updates for AWS vs VirtualBox (Default) providers -sample files also support test cases.
Modified Paths:
--------------
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/brew/bigdata.rb
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/chef/README.md
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/Vagrantfile
Added Paths:
-----------
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Berksfile
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Gemfile
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Thorfile
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Vagrantfile.aws.mapgraph
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Vagrantfile.aws.nss
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Vagrantfile.aws.nss.build-from-svn
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Vagrantfile.aws.tomcat
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Vagrantfile.aws.tomcat.build-from-svn
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/aws.rc
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/chefignore
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/metadata.rb
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Berksfile
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Gemfile
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Thorfile
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Vagrantfile.dual-provider.tomcat
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Vagrantfile.nss
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Vagrantfile.nss.build-from-svn
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Vagrantfile.tomcat
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Vagrantfile.tomcat.build-from-svn
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/chefignore
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/metadata.rb
Removed Paths:
-------------
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Berksfile
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Gemfile
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Thorfile
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.mapgraph
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss.build-from-svn
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat.build-from-svn
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.dual-provider.tomcat
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/aws.rc
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/chefignore
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/metadata.rb
Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/brew/bigdata.rb
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/brew/bigdata.rb 2014-05-20 13:53:26 UTC (rev 8379)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/brew/bigdata.rb 2014-05-20 14:46:29 UTC (rev 8380)
@@ -1,19 +1,19 @@
require "formula"
class Bigdata < Formula
- homepage "http://bigdata.com/blog/"
+ homepage "http://bigdata.com/"
url "http://bigdata.com/deploy/bigdata-1.3.0.tgz"
sha1 "c22fa05df965019b3132161507ce0e77a4a1f6e2"
def install
- prefix.install "doc"
- prefix.install "var"
- prefix.install "bin"
+ prefix.install "doc", "var", "bin"
libexec.install "lib"
# Set the installation path as the root for the bin scripts:
- inreplace "#{bin}/bigdata", "<%= BD_HOME %>", prefix
- inreplace "#{bin}/bigdata", "<%= INSTALL_TYPE %>", "BREW"
+ inreplace "#{bin}/bigdata" do |s|
+ s.sub! "<%= BD_HOME %>", prefix
+ s.sub! "<%= INSTALL_TYPE %>", "BREW"
+ end
# Set the Jetty root as the resourceBase in the jetty.xml file:
inreplace "#{prefix}/var/jetty/etc/jetty.xml", "<%= JETTY_DIR %>", "#{prefix}/var/jetty"
Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/chef/README.md
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/chef/README.md 2014-05-20 13:53:26 UTC (rev 8379)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/chef/README.md 2014-05-20 14:46:29 UTC (rev 8380)
@@ -122,12 +122,12 @@
chef.json = {
:bigdata => {
- :install_type => "tomcat",
+ :install_flavor => "tomcat",
:build_from_svn => true,
:svn_branch => "https://svn.code.sf.net/p/bigdata/code/branches/BTREE_BUFFER_BRANCH/"
},
:java => {
- "install_flavor" => "oracle",
+ :install_flavor => "oracle",
:jdk_version => "7",
:oracle => { 'accept_oracle_download_terms' => true }
},
@@ -149,10 +149,10 @@
chef.json = {
:bigdata => {
- :install_type => "nss"
+ :install_flavor => "nss"
},
:java => {
- "install_flavor" => "oracle",
+ :install_flavor => "oracle",
:jdk_version => "7",
:oracle => { 'accept_oracle_download_terms' => true }
}
Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/Vagrantfile
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/Vagrantfile 2014-05-20 13:53:26 UTC (rev 8379)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/Vagrantfile 2014-05-20 14:46:29 UTC (rev 8380)
@@ -1,8 +1,14 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
#
+# Vagraant.aws.ha3 - Install the Bigdata High Availability Server with 3 Nodes with an AWS Provider
+#
# This vagrant file is meant to be launched by the bin/createCluster.sh script.
#
+# The launch synopsis for this Vagrantfile:
+#
+# % bin/createCluster.sh
+#
ENV['VAGRANT_DEFAULT_PROVIDER'] = 'aws'
Vagrant.require_plugin "vagrant-berkshelf"
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Berksfile
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Berksfile (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Berksfile 2014-05-20 14:46:29 UTC (rev 8380)
@@ -0,0 +1,13 @@
+site :opscode
+
+cookbook "apt"
+cookbook 'java', '~> 1.22.0'
+cookbook 'ant'
+cookbook 'tomcat'
+cookbook 'subversion'
+cookbook 'lvm'
+cookbook "hadoop"
+cookbook "emacs"
+cookbook "sysstat"
+
+metadata
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Gemfile
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Gemfile (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Gemfile 2014-05-20 14:46:29 UTC (rev 8380)
@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'berkshelf'
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Thorfile
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Thorfile (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Thorfile 2014-05-20 14:46:29 UTC (rev 8380)
@@ -0,0 +1,5 @@
+# encoding: utf-8
+
+require 'bundler'
+require 'bundler/setup'
+require 'berkshelf/thor'
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Vagrantfile.aws.mapgraph
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Vagrantfile.aws.mapgraph (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Vagrantfile.aws.mapgraph 2014-05-20 14:46:29 UTC (rev 8380)
@@ -0,0 +1,70 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# Vagrantfile.aws.mapgraph - Build and Test MapGraph from a Source Branch with an AWS Povider
+#
+# The launch synopsis for this Vagrantfile:
+#
+# % source ./aws.rc
+# % vagrant up
+#
+ENV['VAGRANT_DEFAULT_PROVIDER'] = 'aws'
+
+Vagrant.require_plugin "vagrant-berkshelf"
+
+Vagrant.configure("2") do |config|
+
+ config.ssh.pty = true
+ config.vm.box = "dummy"
+ config.vm.hostname = ENV['BIGDATA_HA_HOST_A']
+
+ config.berkshelf.enabled = true
+
+ config.vm.provider :aws do |aws, override|
+ aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
+ aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+ aws.keypair_name = ENV['AWS_KEYPAIR_NAME']
+
+ aws.ami = "ami-41e7ce28"
+
+ # Amazon Linux AMI with NVIDIA GRID GPU Driver
+ #
+ # https://aws.amazon.com/marketplace/pp/B00FYCDDTE?ref=cns_srchrow
+ #
+ aws.region = ENV['AWS_REGION']
+ aws.instance_type = "g2.2xlarge"
+ aws.security_groups = [ ENV['AWS_SECURITY_GROUPS'], ENV['AWS_SECURITY_GROUP_PRIVATE'] ]
+
+ aws.tags = {
+ 'Name' => ENV['BIGDATA_HA_HOST_A']
+ }
+
+ override.ssh.username = "ec2-user"
+ override.ssh.private_key_path = ENV['AWS_SSH_PRIVATE_KEY']
+ end
+
+
+ config.vm.provision :chef_solo do |chef|
+ chef.json = {
+ :java => {
+ "install_flavor" => "oracle",
+ :jdk_version => "7",
+ :oracle => { 'accept_oracle_download_terms' => true }
+ }
+ }
+
+$script = <<SCRIPT
+ yum -y update
+ sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash
+ yum -y groupinstall "Development Tools"
+SCRIPT
+
+ config.vm.provision :shell, inline: $script
+
+ chef.run_list = [
+ "recipe[emacs]",
+ "recipe[bigdata::mapgraph]"
+ ]
+
+ end
+end
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Vagrantfile.aws.nss
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Vagrantfile.aws.nss (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Vagrantfile.aws.nss 2014-05-20 14:46:29 UTC (rev 8380)
@@ -0,0 +1,65 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# Vagrantfile.aws.nss - Install Bigdata NanoSparqlServer with an AWS Provider
+#
+# The launch synopsis for this Vagrantfile:
+#
+# % source ./aws.rc
+# % vagrant up
+#
+ENV['VAGRANT_DEFAULT_PROVIDER'] = 'aws'
+
+Vagrant.require_plugin "vagrant-berkshelf"
+
+Vagrant.configure("2") do |config|
+
+ config.vm.box = "dummy"
+ config.vm.hostname = ENV['BIGDATA_HA_HOST_A']
+
+ config.berkshelf.enabled = true
+
+ config.vm.provider :aws do |aws, override|
+ aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
+ aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+ aws.keypair_name = ENV['AWS_KEYPAIR_NAME']
+
+ aws.ami = ENV['AWS_AMI']
+
+ aws.region = ENV['AWS_REGION']
+ aws.instance_type = ENV['AWS_INSTANCE_TYPE']
+ aws.security_groups = [ ENV['AWS_SECURITY_GROUPS'], ENV['AWS_SECURITY_GROUP_PRIVATE'] ]
+
+ aws.tags = {
+ 'Name' => ENV['BIGDATA_HA_HOST_A']
+ }
+
+ override.ssh.username = ENV['AWS_AMI_USERNAME']
+ override.ssh.private_key_path = ENV['AWS_SSH_PRIVATE_KEY']
+ end
+
+
+ config.vm.provision :chef_solo do |chef|
+ chef.json = {
+ :bigdata => {
+ :install_flavor => "nss",
+ :build_from_svn => false
+ },
+ :java => {
+ "install_flavor" => "oracle",
+ :jdk_version => "7",
+ :oracle => { 'accept_oracle_download_terms' => true }
+ },
+ :tomcat => {
+ :base_version => "7"
+ }
+ }
+
+ config.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
+
+ chef.run_list = [
+ "recipe[bigdata::nss]"
+ ]
+
+ end
+end
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Vagrantfile.aws.nss.build-from-svn
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Vagrantfile.aws.nss.build-from-svn (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Vagrantfile.aws.nss.build-from-svn 2014-05-20 14:46:29 UTC (rev 8380)
@@ -0,0 +1,69 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# Vagrantfile.aws.nss.build-from-svn - Build and Install Bigdata NanoSparqlServer from a Source Branch with an AWS Provider
+#
+# The launch synopsis for this Vagrantfile:
+#
+# % source ./aws.rc
+# % vagrant up
+#
+ENV['VAGRANT_DEFAULT_PROVIDER'] = 'aws'
+
+Vagrant.require_plugin "vagrant-berkshelf"
+
+Vagrant.configure("2") do |config|
+
+ config.vm.box = "dummy"
+ config.vm.hostname = ENV['BIGDATA_HA_HOST_A']
+
+ config.berkshelf.enabled = true
+
+ config.vm.provider :aws do |aws, override|
+ aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
+ aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+ aws.keypair_name = ENV['AWS_KEYPAIR_NAME']
+
+ aws.ami = ENV['AWS_AMI']
+
+ aws.region = ENV['AWS_REGION']
+ aws.instance_type = ENV['AWS_INSTANCE_TYPE']
+ aws.security_groups = [ ENV['AWS_SECURITY_GROUPS'], ENV['AWS_SECURITY_GROUP_PRIVATE'] ]
+
+ aws.tags = {
+ 'Name' => ENV['BIGDATA_HA_HOST_A']
+ }
+
+ override.ssh.username = ENV['AWS_AMI_USERNAME']
+ override.ssh.private_key_path = ENV['AWS_SSH_PRIVATE_KEY']
+ end
+
+
+ config.vm.provision :chef_solo do |chef|
+ chef.json = {
+ :bigdata => {
+ :install_flavor => "nss",
+ :build_from_svn => true,
+ #
+ # Uncomment the below and set a desired Subversion URL to override the setting in attributes/default.rb
+ #
+ # :svn_branch = "https://svn.code.sf.net/p/bigdata/code/branches/DEPLOYMENT_BRANCH_1_3_1"
+ },
+ :java => {
+ "install_flavor" => "oracle",
+ :jdk_version => "7",
+ :oracle => { 'accept_oracle_download_terms' => true }
+ },
+ :tomcat => {
+ :base_version => "7"
+ }
+ }
+
+ config.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
+
+ chef.run_list = [
+ "recipe[bigdata::nss]"
+ ]
+
+ end
+end
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Vagrantfile.aws.tomcat
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Vagrantfile.aws.tomcat (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Vagrantfile.aws.tomcat 2014-05-20 14:46:29 UTC (rev 8380)
@@ -0,0 +1,64 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# Vagrantfile.aws.tomcat - Install Bigdata under Tomcat with an AWS Provider
+#
+# The launch synopsis for this Vagrantfile:
+#
+# % source ./aws.rc
+# % vagrant up
+#
+ENV['VAGRANT_DEFAULT_PROVIDER'] = 'aws'
+
+Vagrant.require_plugin "vagrant-berkshelf"
+
+Vagrant.configure("2") do |config|
+ config.vm.box = "dummy"
+ config.vm.hostname = ENV['BIGDATA_HA_HOST_A']
+
+ config.berkshelf.enabled = true
+
+ config.vm.provider :aws do |aws, override|
+ aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
+ aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+ aws.keypair_name = ENV['AWS_KEYPAIR_NAME']
+
+ aws.ami = ENV['AWS_AMI']
+
+ aws.region = ENV['AWS_REGION']
+ aws.instance_type = ENV['AWS_INSTANCE_TYPE']
+ aws.security_groups = [ ENV['AWS_SECURITY_GROUPS'], ENV['AWS_SECURITY_GROUP_PRIVATE'] ]
+
+ aws.tags = {
+ 'Name' => ENV['BIGDATA_HA_HOST_A']
+ }
+
+ override.ssh.username = ENV['AWS_AMI_USERNAME']
+ override.ssh.private_key_path = ENV['AWS_SSH_PRIVATE_KEY']
+ end
+
+
+ config.vm.provision :chef_solo do |chef|
+ chef.json = {
+ :bigdata => {
+ :install_flavor => "tomcat",
+ :build_from_svn => false
+ },
+ :java => {
+ "install_flavor" => "oracle",
+ :jdk_version => "7",
+ :oracle => { 'accept_oracle_download_terms' => true }
+ },
+ :tomcat => {
+ :base_version => "7"
+ }
+ }
+
+ config.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
+
+ chef.run_list = [
+ "recipe[bigdata::tomcat]"
+ ]
+
+ end
+end
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Vagrantfile.aws.tomcat.build-from-svn
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Vagrantfile.aws.tomcat.build-from-svn (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/Vagrantfile.aws.tomcat.build-from-svn 2014-05-20 14:46:29 UTC (rev 8380)
@@ -0,0 +1,69 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# Vagrantfile.aws.tomcat.build-from-svn - Build and Install Bigdata under Tomcat from a Source Branch with an AWS Provider
+#
+# The launch synopsis for this Vagrantfile:
+#
+# % source ./aws.rc
+# % vagrant up
+#
+ENV['VAGRANT_DEFAULT_PROVIDER'] = 'aws'
+
+Vagrant.require_plugin "vagrant-berkshelf"
+
+Vagrant.configure("2") do |config|
+
+ config.vm.box = "dummy"
+ config.vm.hostname = ENV['BIGDATA_HA_HOST_A']
+
+ config.berkshelf.enabled = true
+
+ config.vm.provider :aws do |aws, override|
+ aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
+ aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+ aws.keypair_name = ENV['AWS_KEYPAIR_NAME']
+
+ aws.ami = ENV['AWS_AMI']
+
+ aws.region = ENV['AWS_REGION']
+ aws.instance_type = ENV['AWS_INSTANCE_TYPE']
+ aws.security_groups = [ ENV['AWS_SECURITY_GROUPS'], ENV['AWS_SECURITY_GROUP_PRIVATE'] ]
+
+ aws.tags = {
+ 'Name' => ENV['BIGDATA_HA_HOST_A']
+ }
+
+ override.ssh.username = ENV['AWS_AMI_USERNAME']
+ override.ssh.private_key_path = ENV['AWS_SSH_PRIVATE_KEY']
+ end
+
+
+ config.vm.provision :chef_solo do |chef|
+ chef.json = {
+ :bigdata => {
+ :install_flavor => "tomcat",
+ :build_from_svn => true,
+ #
+ # Uncomment the below and set a desired Subversion URL to override the setting in attributes/default.rb
+ #
+ # :svn_branch = "https://svn.code.sf.net/p/bigdata/code/branches/DEPLOYMENT_BRANCH_1_3_1"
+ },
+ :java => {
+ "install_flavor" => "oracle",
+ :jdk_version => "7",
+ :oracle => { 'accept_oracle_download_terms' => true }
+ },
+ :tomcat => {
+ :base_version => "7"
+ }
+ }
+
+ config.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
+
+ chef.run_list = [
+ "recipe[bigdata::tomcat]"
+ ]
+
+ end
+end
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/aws.rc
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/aws.rc (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/aws.rc 2014-05-20 14:46:29 UTC (rev 8380)
@@ -0,0 +1,45 @@
+#
+# Set your organization's AWS access credentials here:
+#
+export AWS_ACCESS_KEY_ID="YOUR AWS ACCESS KEY ID"
+export AWS_SECRET_ACCESS_KEY="YOUR AWS SECRET ACCESS KEY"
+export AWS_SSH_PRIVATE_KEY="/path/to/your/private_key.pem"
+export AWS_KEYPAIR_NAME="YOUR AWS KEYPAIR NAME"
+
+
+#
+# Add a single security group here (a list will be supported later).
+# The security group must minimally allow outside access to ports 22 and 8080.
+#
+# SSH TCP 22 0.0.0.0/0
+# Custom TCP Rule TCP 8080 0.0.0.0/0
+#
+export AWS_SECURITY_GROUPS="YOUR AWS SECURITY GROUP"
+
+
+#
+# Adjust as desired:
+#
+export AWS_REGION="us-east-1"
+
+
+#
+# Ubuntu 12.04 settings:
+#
+export AWS_AMI="ami-59a4a230"
+export AWS_AMI_USERNAME="ubuntu"
+
+
+#
+# The SSD configuration assumes the m3.xlarge size. The SSD recipe should work for
+# SSD devices (not more than two) of any size, but has not been tested.
+#
+export AWS_INSTANCE_TYPE="m3.xlarge"
+
+
+#
+# Default host names, adjust as desired:
+#
+export BIGDATA_HA_HOST_A="bigdataA"
+export BIGDATA_HA_HOST_B="bigdataB"
+export BIGDATA_HA_HOST_C="bigdataC"
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/chefignore
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/chefignore (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/chefignore 2014-05-20 14:46:29 UTC (rev 8380)
@@ -0,0 +1,96 @@
+# Put files/directories that should be ignored in this file when uploading
+# or sharing to the community site.
+# Lines that start with '# ' are comments.
+
+# OS generated files #
+######################
+.DS_Store
+Icon?
+nohup.out
+ehthumbs.db
+Thumbs.db
+
+# SASS #
+########
+.sass-cache
+
+# EDITORS #
+###########
+\#*
+.#*
+*~
+*.sw[a-z]
+*.bak
+REVISION
+TAGS*
+tmtags
+*_flymake.*
+*_flymake
+*.tmproj
+.project
+.settings
+mkmf.log
+
+## COMPILED ##
+##############
+a.out
+*.o
+*.pyc
+*.so
+*.com
+*.class
+*.dll
+*.exe
+*/rdoc/
+
+# Testing #
+###########
+.watchr
+.rspec
+spec/*
+spec/fixtures/*
+test/*
+features/*
+Guardfile
+Procfile
+
+# SCM #
+#######
+.git
+*/.git
+.gitignore
+.gitmodules
+.gitconfig
+.gitattributes
+.svn
+*/.bzr/*
+*/.hg/*
+*/.svn/*
+
+# Berkshelf #
+#############
+Berksfile
+Berksfile.lock
+cookbooks/*
+tmp
+
+# Cookbooks #
+#############
+CONTRIBUTING
+CHANGELOG*
+
+# Strainer #
+############
+Colanderfile
+Strainerfile
+.colander
+.strainer
+
+# Vagrant #
+###########
+.vagrant
+Vagrantfile
+
+# Travis #
+##########
+.travis.yml
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/metadata.rb
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/metadata.rb (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/AWS/metadata.rb 2014-05-20 14:46:29 UTC (rev 8380)
@@ -0,0 +1,17 @@
+name 'bigdata'
+maintainer 'Daniel Mekonnen'
+maintainer_email 'daniel<no-spam-at>systap.com'
+license 'GNU GPLv2'
+description 'Installs/Configures Systap Bigdata High Availability'
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version '0.1.3'
+
+depends 'apt'
+depends 'java', '>= 1.22.0'
+depends 'ant'
+depends 'tomcat'
+depends 'subversion'
+depends 'lvm'
+depends 'hadoop'
+depends 'emacs'
+depends 'sysstat'
Deleted: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Berksfile
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Berksfile 2014-05-20 13:53:26 UTC (rev 8379)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Berksfile 2014-05-20 14:46:29 UTC (rev 8380)
@@ -1,13 +0,0 @@
-site :opscode
-
-cookbook "apt"
-cookbook 'java', '~> 1.22.0'
-cookbook 'ant'
-cookbook 'tomcat'
-cookbook 'subversion'
-cookbook 'lvm'
-cookbook "hadoop"
-cookbook "emacs"
-cookbook "sysstat"
-
-metadata
Deleted: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Gemfile
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Gemfile 2014-05-20 13:53:26 UTC (rev 8379)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Gemfile 2014-05-20 14:46:29 UTC (rev 8380)
@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'berkshelf'
Deleted: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Thorfile
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Thorfile 2014-05-20 13:53:26 UTC (rev 8379)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Thorfile 2014-05-20 14:46:29 UTC (rev 8380)
@@ -1,5 +0,0 @@
-# encoding: utf-8
-
-require 'bundler'
-require 'bundler/setup'
-require 'berkshelf/thor'
Deleted: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.mapgraph
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.mapgraph 2014-05-20 13:53:26 UTC (rev 8379)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.mapgraph 2014-05-20 14:46:29 UTC (rev 8380)
@@ -1,69 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-#
-# Vagrantfile.aws.mapgraph
-#
-# The launch synopsis for this Vagrantfile:
-#
-# % source ./aws.rc
-# % vagrant up
-#
-ENV['VAGRANT_DEFAULT_PROVIDER'] = 'aws'
-
-Vagrant.require_plugin "vagrant-berkshelf"
-
-Vagrant.configure("2") do |config|
- config.ssh.pty = true
- config.vm.box = "dummy"
- config.vm.hostname = ENV['BIGDATA_HA_HOST_A']
-
- config.berkshelf.enabled = true
-
- config.vm.provider :aws do |aws, override|
- aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
- aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
- aws.keypair_name = ENV['AWS_KEYPAIR_NAME']
-
- aws.ami = "ami-41e7ce28"
-
- # Amazon Linux AMI with NVIDIA GRID GPU Driver
- #
- # https://aws.amazon.com/marketplace/pp/B00FYCDDTE?ref=cns_srchrow
- #
- aws.region = ENV['AWS_REGION']
- aws.instance_type = "g2.2xlarge"
- aws.security_groups = [ ENV['AWS_SECURITY_GROUPS'], ENV['AWS_SECURITY_GROUP_PRIVATE'] ]
-
- aws.tags = {
- 'Name' => ENV['BIGDATA_HA_HOST_A']
- }
-
- override.ssh.username = "ec2-user"
- override.ssh.private_key_path = ENV['AWS_SSH_PRIVATE_KEY']
- end
-
-
- config.vm.provision :chef_solo do |chef|
- chef.json = {
- :java => {
- "install_flavor" => "oracle",
- :jdk_version => "7",
- :oracle => { 'accept_oracle_download_terms' => true }
- }
- }
-
-$script = <<SCRIPT
- yum -y update
- sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash
- yum -y groupinstall "Development Tools"
-SCRIPT
-
- config.vm.provision :shell, inline: $script
-
- chef.run_list = [
- "recipe[emacs]",
- "recipe[bigdata::mapgraph]"
- ]
-
- end
-end
Deleted: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss 2014-05-20 13:53:26 UTC (rev 8379)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss 2014-05-20 14:46:29 UTC (rev 8380)
@@ -1,64 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-#
-# Vagrantfile.aws.nss
-#
-# The launch synopsis for this Vagrantfile:
-#
-# % source ./aws.rc
-# % vagrant up
-#
-ENV['VAGRANT_DEFAULT_PROVIDER'] = 'aws'
-
-Vagrant.require_plugin "vagrant-berkshelf"
-
-Vagrant.configure("2") do |config|
- config.vm.box = "dummy"
- config.vm.hostname = ENV['BIGDATA_HA_HOST_A']
-
- config.berkshelf.enabled = true
-
- config.vm.provider :aws do |aws, override|
- aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
- aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
- aws.keypair_name = ENV['AWS_KEYPAIR_NAME']
-
- aws.ami = ENV['AWS_AMI']
-
- aws.region = ENV['AWS_REGION']
- aws.instance_type = ENV['AWS_INSTANCE_TYPE']
- aws.security_groups = [ ENV['AWS_SECURITY_GROUPS'], ENV['AWS_SECURITY_GROUP_PRIVATE'] ]
-
- aws.tags = {
- 'Name' => ENV['BIGDATA_HA_HOST_A']
- }
-
- override.ssh.username = ENV['AWS_AMI_USERNAME']
- override.ssh.private_key_path = ENV['AWS_SSH_PRIVATE_KEY']
- end
-
-
- config.vm.provision :chef_solo do |chef|
- chef.json = {
- :bigdata => {
- :install_flavor => "nss",
- :build_from_svn => false
- },
- :java => {
- "install_flavor" => "oracle",
- :jdk_version => "7",
- :oracle => { 'accept_oracle_download_terms' => true }
- },
- :tomcat => {
- :base_version => "7"
- }
- }
-
- config.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
-
- chef.run_list = [
- "recipe[bigdata::nss]"
- ]
-
- end
-end
Deleted: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss.build-from-svn
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss.build-from-svn 2014-05-20 13:53:26 UTC (rev 8379)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss.build-from-svn 2014-05-20 14:46:29 UTC (rev 8380)
@@ -1,64 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-#
-# Vagrantfile.aws.nss.build-from-svn
-#
-# The launch synopsis for this Vagrantfile:
-#
-# % source ./aws.rc
-# % vagrant up
-#
-ENV['VAGRANT_DEFAULT_PROVIDER'] = 'aws'
-
-Vagrant.require_plugin "vagrant-berkshelf"
-
-Vagrant.configure("2") do |config|
- config.vm.box = "dummy"
- config.vm.hostname = ENV['BIGDATA_HA_HOST_A']
-
- config.berkshelf.enabled = true
-
- config.vm.provider :aws do |aws, override|
- aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
- aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
- aws.keypair_name = ENV['AWS_KEYPAIR_NAME']
-
- aws.ami = ENV['AWS_AMI']
-
- aws.region = ENV['AWS_REGION']
- aws.instance_type = ENV['AWS_INSTANCE_TYPE']
- aws.security_groups = [ ENV['AWS_SECURITY_GROUPS'], ENV['AWS_SECURITY_GROUP_PRIVATE'] ]
-
- aws.tags = {
- 'Name' => ENV['BIGDATA_HA_HOST_A']
- }
-
- override.ssh.username = ENV['AWS_AMI_USERNAME']
- override.ssh.private_key_path = ENV['AWS_SSH_PRIVATE_KEY']
- end
-
-
- config.vm.provision :chef_solo do |chef|
- chef.json = {
- :bigdata => {
- :install_flavor => "nss",
- :build_from_svn => true
- },
- :java => {
- "install_flavor" => "oracle",
- :jdk_version => "7",
- :oracle => { 'accept_oracle_download_terms' => true }
- },
- :tomcat => {
- :base_version => "7"
- }
- }
-
- config.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
-
- chef.run_list = [
- "recipe[bigdata::nss]"
- ]
-
- end
-end
Deleted: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat 2014-05-20 13:53:26 UTC (rev 8379)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat 2014-05-20 14:46:29 UTC (rev 8380)
@@ -1,64 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-#
-# Vagrantfile.aws.tomcat
-#
-# The launch synopsis for this Vagrantfile:
-#
-# % source ./aws.rc
-# % vagrant up
-#
-ENV['VAGRANT_DEFAULT_PROVIDER'] = 'aws'
-
-Vagrant.require_plugin "vagrant-berkshelf"
-
-Vagrant.configure("2") do |config|
- config.vm.box = "dummy"
- config.vm.hostname = ENV['BIGDATA_HA_HOST_A']
-
- config.berkshelf.enabled = true
-
- config.vm.provider :aws do |aws, override|
- aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
- aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
- aws.keypair_name = ENV['AWS_KEYPAIR_NAME']
-
- aws.ami = ENV['AWS_AMI']
-
- aws.region = ENV['AWS_REGION']
- aws.instance_type = ENV['AWS_INSTANCE_TYPE']
- aws.security_groups = [ ENV['AWS_SECURITY_GROUPS'], ENV['AWS_SECURITY_GROUP_PRIVATE'] ]
-
- aws.tags = {
- 'Name' => ENV['BIGDATA_HA_HOST_A']
- }
-
- override.ssh.username = ENV['AWS_AMI_USERNAME']
- override.ssh.private_key_path = ENV['AWS_SSH_PRIVATE_KEY']
- end
-
-
- config.vm.provision :chef_solo do |chef|
- chef.json = {
- :bigdata => {
- :install_flavor => "tomcat",
- :build_from_svn => false
- },
- :java => {
- "install_flavor" => "oracle",
- :jdk_version => "7",
- :oracle => { 'accept_oracle_download_terms' => true }
- },
- :tomcat => {
- :base_version => "7"
- }
- }
-
- config.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
-
- chef.run_list = [
- "recipe[bigdata::tomcat]"
- ]
-
- end
-end
Deleted: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat.build-from-svn
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat.build-from-svn 2014-05-20 13:53:26 UTC (rev 8379)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat.build-from-svn 2014-05-20 14:46:29 UTC (rev 8380)
@@ -1,64 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-#
-# Vagrantfile.aws.tomcat.build-from-svn
-#
-# The launch synopsis for this Vagrantfile:
-#
-# % source ./aws.rc
-# % vagrant up
-#
-ENV['VAGRANT_DEFAULT_PROVIDER'] = 'aws'
-
-Vagrant.require_plugin "vagrant-berkshelf"
-
-Vagrant.configure("2") do |config|
- config.vm.box = "dummy"
- config.vm.hostname = ENV['BIGDATA_HA_HOST_A']
-
- config.berkshelf.enabled = true
-
- config.vm.provider :aws do |aws, override|
- aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
- aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
- aws.keypair_name = ENV['AWS_KEYPAIR_NAME']
-
- aws.ami = ENV['AWS_AMI']
-
- aws.region = ENV['AWS_REGION']
- aws.instance_type = ENV['AWS_INSTANCE_TYPE']
- aws.security_groups = [ ENV['AWS_SECURITY_GROUPS'], ENV['AWS_SECURITY_GROUP_PRIVATE'] ]
-
- aws.tags = {
- 'Name' => ENV['BIGDATA_HA_HOST_A']
- }
-
- override.ssh.username = ENV['AWS_AMI_USERNAME']
- override.ssh.private_key_path = ENV['AWS_SSH_PRIVATE_KEY']
- end
-
-
- config.vm.provision :chef_solo do |chef|
- chef.json = {
- :bigdata => {
- :install_flavor => "tomcat",
- :build_from_svn => true
- },
- :java => {
- "install_flavor" => "oracle",
- :jdk_version => "7",
- :oracle => { 'accept_oracle_download_terms' => true }
- },
- :tomcat => {
- :base_version => "7"
- }
- }
-
- config.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
-
- chef.run_list = [
- "recipe[bigdata::tomcat]"
- ]
-
- end
-end
Deleted: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.dual-provider.tomcat
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.dual-provider.tomcat 2014-05-20 13:53:26 UTC (rev 8379)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.dual-provider.tomcat 2014-05-20 14:46:29 UTC (rev 8380)
@@ -1,84 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-#
-# Vagrantfile.dual-provider.tomcat
-#
-# The launch synopsis for this Vagrantfile:
-#
-# VirtualBox provider:
-#
-# % vagrant up
-#
-# AWS provider:
-#
-# % source ./aws.rc
-# % vagrant up --provider=aws
-#
-
-Vagrant.require_plugin "vagrant-berkshelf"
-
-Vagrant.configure("2") do |config|
- #
- # By default, the VirtualBox provider will be launched.
- # Defaults are set for the VirtualBox assumption.
- #
- config.vm.box = "precise64"
- config.vm.hostname = "bigdata"
-
- config.berkshelf.enabled = true
-
- config.vm.provider :virtualbox do |vb|
- vb.vm.box_url = "http://files.vagrantup.com/precise64.box"
-
- vb.vm.network :private_network, ip: "33.33.33.10"
- end
-
- #
- # The AWS provider will be used specified at the command line as per:
- # % vagrant up --provider=aws
- #
- config.vm.provider :aws do |aws, override|
- override.vm.box = "dummy"
- aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
- aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
- aws.keypair_name = ENV['AWS_KEYPAIR_NAME']
-
- aws.ami = ENV['AWS_AMI']
-
- aws.region = ENV['AWS_REGION']
- aws.instance_type = ENV['AWS_INSTANCE_TYPE']
- aws.security_groups = [ ENV['AWS_SECURITY_GROUPS'], ENV['AWS_SECURITY_GROUP_PRIVATE'] ]
-
- aws.tags = {
- 'Name' => ENV['BIGDATA_HA_HOST_A']
- }
-
- override.ssh.username = ENV['AWS_AMI_USERNAME']
- override.ssh.private_key_path = ENV['AWS_SSH_PRIVATE_KEY']
- end
-
-
- config.vm.provision :chef_solo do |chef|
- chef.json = {
- :bigdata => {
- :install_flavor => "tomcat",
- :build_from_svn => false
- },
- :java => {
- :install_flavor => "oracle",
- :jdk_version => "7",
- :oracle => { 'accept_oracle_download_terms' => true }
- },
- :tomcat => {
- :base_version => "7"
- }
- }
-
- config.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
-
- chef.run_list = [
- "recipe[bigdata::tomcat]"
- ]
-
- end
-end
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Berksfile
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Berksfile (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Berksfile 2014-05-20 14:46:29 UTC (rev 8380)
@@ -0,0 +1,16 @@
+site :opscode
+
+cookbook "apt"
+cookbook 'java', '~> 1.22.0'
+cookbook 'ant'
+cookbook 'tomcat'
+cookbook 'subversion'
+#
+# The lvm cookbook breaks a virtualbox launch, so commented out here:
+#
+# cookbook 'lvm'
+cookbook "hadoop"
+cookbook "emacs"
+cookbook "sysstat"
+
+metadata
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Gemfile
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Gemfile (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Gemfile 2014-05-20 14:46:29 UTC (rev 8380)
@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'berkshelf'
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Thorfile
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Thorfile (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Thorfile 2014-05-20 14:46:29 UTC (rev 8380)
@@ -0,0 +1,5 @@
+# encoding: utf-8
+
+require 'bundler'
+require 'bundler/setup'
+require 'berkshelf/thor'
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Vagrantfile.dual-provider.tomcat
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Vagrantfile.dual-provider.tomcat (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Vagrantfile.dual-provider.tomcat 2014-05-20 14:46:29 UTC (rev 8380)
@@ -0,0 +1,84 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# Vagrantfile.dual-provider.tomcat - Install Bigdata under Tomcat with an either a VirtualBox (Default) or AWS Provider
+#
+# The launch synopsis for this Vagrantfile:
+#
+# VirtualBox provider:
+#
+# % vagrant up
+#
+# AWS provider:
+#
+# % source ./aws.rc
+# % vagrant up --provider=aws
+#
+
+Vagrant.require_plugin "vagrant-berkshelf"
+
+Vagrant.configure("2") do |config|
+ #
+ # By default, the VirtualBox provider will be launched.
+ # Defaults are set for the VirtualBox assumption.
+ #
+ config.vm.box = "precise64"
+ config.vm.hostname = "bigdata"
+
+ config.berkshelf.enabled = true
+
+ config.vm.provider :virtualbox do |vb|
+ vb.vm.box_url = "http://files.vagrantup.com/precise64.box"
+
+ vb.vm.network :private_network, ip: "33.33.33.10"
+ end
+
+ #
+ # The AWS provider will be used specified at the command line as per:
+ # % vagrant up --provider=aws
+ #
+ config.vm.provider :aws do |aws, override|
+ override.vm.box = "dummy"
+ aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
+ aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+ aws.keypair_name = ENV['AWS_KEYPAIR_NAME']
+
+ aws.ami = ENV['AWS_AMI']
+
+ aws.region = ENV['AWS_REGION']
+ aws.instance_type = ENV['AWS_INSTANCE_TYPE']
+ aws.security_groups = [ ENV['AWS_SECURITY_GROUPS'], ENV['AWS_SECURITY_GROUP_PRIVATE'] ]
+
+ aws.tags = {
+ 'Name' => ENV['BIGDATA_HA_HOST_A']
+ }
+
+ override.ssh.username = ENV['AWS_AMI_USERNAME']
+ override.ssh.private_key_path = ENV['AWS_SSH_PRIVATE_KEY']
+ end
+
+
+ config.vm.provision :chef_solo do |chef|
+ chef.json = {
+ :bigdata => {
+ :install_flavor => "tomcat",
+ :build_from_svn => false
+ },
+ :java => {
+ :install_flavor => "oracle",
+ :jdk_version => "7",
+ :oracle => { 'accept_oracle_download_terms' => true }
+ },
+ :tomcat => {
+ :base_version => "7"
+ }
+ }
+
+ config.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
+
+ chef.run_list = [
+ "recipe[bigdata::tomcat]"
+ ]
+
+ end
+end
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Vagrantfile.nss
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Vagrantfile.nss (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Vagrantfile.nss 2014-05-20 14:46:29 UTC (rev 8380)
@@ -0,0 +1,48 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# Vagrantfile.nss - Install Bigdata NanoSparqlServer with a VirtualBox (Default) Provider
+#
+# The launch synopsis for this Vagrantfile:
+#
+# % vagrant up
+#
+
+Vagrant.require_plugin "vagrant-berkshelf"
+
+Vagrant.configure("2") do |config|
+
+ config.vm.hostname = "bigdata"
+ config.vm.box = "precise64"
+
+ config.berkshelf.enabled = true
+
+ config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+
+ config.vm.network :private_network, ip: "33.33.33.10"
+
+
+ config.vm.provision :chef_solo do |chef|
+ chef.json = {
+ :bigdata => {
+ :install_flavor => "nss",
+ :build_from_svn => false
+ },
+ :java => {
+ :install_flavor => "oracle",
+ :jdk_version => "7",
+ :oracle => { 'accept_oracle_download_terms' => true }
+ },
+ :tomcat => {
+ :base_version => "7"
+ }
+ }
+
+ config.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
+
+ chef.run_list = [
+ "recipe[bigdata::tomcat]"
+ ]
+
+ end
+end
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Vagrantfile.nss.build-from-svn
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Vagrantfile.nss.build-from-svn (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Vagrantfile.nss.build-from-svn 2014-05-20 14:46:29 UTC (rev 8380)
@@ -0,0 +1,52 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# Vagrantfile.aws.nss.build-from-svn - Build and Install Bigdata NanoSparqlServer from a Source Branch with a VirtualBox (Default) Provider
+#
+# The launch synopsis for this Vagrantfile:
+#
+# % vagrant up
+#
+
+Vagrant.require_plugin "vagrant-berkshelf"
+
+Vagrant.configure("2") do |config|
+
+ config.vm.hostname = "bigdata"
+ config.vm.box = "precise64"
+
+ config.berkshelf.enabled = true
+
+ config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+
+ config.vm.network :private_network, ip: "33.33.33.10"
+
+
+ config.vm.provision :chef_solo do |chef|
+ chef.json = {
+ :bigdata => {
+ :install_flavor => "nss",
+ :build_from_svn => true,
+ #
+ # Uncomment the below and set a desired Subversion URL to override the setting in attributes/default.rb
+ #
+ # :svn_branch = "https://svn.code.sf.net/p/bigdata/code/branches/DEPLOYMENT_BRANCH_1_3_1"
+ },
+ :java => {
+ :install_flavor => "oracle",
+ :jdk_version => "7",
+ :oracle => { 'accept_oracle_download_terms' => true }
+ },
+ :tomcat => {
+ :base_version => "7"
+ }
+ }
+
+ config.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
+
+ chef.run_list = [
+ "recipe[bigdata::tomcat]"
+ ]
+
+ end
+end
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Vagrantfile.tomcat
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Vagrantfile.tomcat (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Vagrantfile.tomcat 2014-05-20 14:46:29 UTC (rev 8380)
@@ -0,0 +1,48 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# Vagrantfile.tomcat - Install Bigdata under Tomcat with a VirtualBox (Default) Provider
+#
+# The launch synopsis for this Vagrantfile:
+#
+# % vagrant up
+#
+
+Vagrant.require_plugin "vagrant-berkshelf"
+
+Vagrant.configure("2") do |config|
+
+ config.vm.hostname = "bigdata"
+ config.vm.box = "precise64"
+
+ config.berkshelf.enabled = true
+
+ config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+
+ config.vm.network :private_network, ip: "33.33.33.10"
+
+
+ config.vm.provision :chef_solo do |chef|
+ chef.json = {
+ :bigdata => {
+ :install_flavor => "tomcat",
+ :build_from_svn => false
+ },
+ :java => {
+ :install_flavor => "oracle",
+ :jdk_version => "7",
+ :oracle => { 'accept_oracle_download_terms' => true }
+ },
+ :tomcat => {
+ :base_version => "7"
+ }
+ }
+
+ config.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
+
+ chef.run_list = [
+ "recipe[bigdata::tomcat]"
+ ]
+
+ end
+end
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Vagrantfile.tomcat.build-from-svn
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Vagrantfile.tomcat.build-from-svn (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/Vagrantfile.tomcat.build-from-svn 2014-05-20 14:46:29 UTC (rev 8380)
@@ -0,0 +1,52 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# Vagrantfile.tomcat - Build and Install Bigdata under Tomcat from a Source Branch with a VirtualBox (Default) Provider
+#
+# The launch synopsis for this Vagrantfile:
+#
+# % vagrant up
+#
+
+Vagrant.require_plugin "vagrant-berkshelf"
+
+Vagrant.configure("2") do |config|
+
+ config.vm.hostname = "bigdata"
+ config.vm.box = "precise64"
+
+ config.berkshelf.enabled = true
+
+ config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+
+ config.vm.network :private_network, ip: "33.33.33.10"
+
+
+ config.vm.provision :chef_solo do |chef|
+ chef.json = {
+ :bigdata => {
+ :install_flavor => "tomcat",
+ :build_from_svn => true,
+ #
+ # Uncomment the below and set a desired Subversion URL to override the setting in attributes/default.rb
+ #
+ # :svn_branch = "https://svn.code.sf.net/p/bigdata/code/branches/DEPLOYMENT_BRANCH_1_3_1"
+ },
+ :java => {
+ :install_flavor => "oracle",
+ :jdk_version => "7",
+ :oracle => { 'accept_oracle_download_terms' => true }
+ },
+ :tomcat => {
+ :base_version => "7"
+ }
+ }
+
+ config.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
+
+ chef.run_list = [
+ "recipe[bigdata::tomcat]"
+ ]
+
+ end
+end
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/chefignore
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/chefignore (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/chefignore 2014-05-20 14:46:29 UTC (rev 8380)
@@ -0,0 +1,96 @@
+# Put files/directories that should be ignored in this file when uploading
+# or sharing to the community site.
+# Lines that start with '# ' are comments.
+
+# OS generated files #
+######################
+.DS_Store
+Icon?
+nohup.out
+ehthumbs.db
+Thumbs.db
+
+# SASS #
+########
+.sass-cache
+
+# EDITORS #
+###########
+\#*
+.#*
+*~
+*.sw[a-z]
+*.bak
+REVISION
+TAGS*
+tmtags
+*_flymake.*
+*_flymake
+*.tmproj
+.project
+.settings
+mkmf.log
+
+## COMPILED ##
+##############
+a.out
+*.o
+*.pyc
+*.so
+*.com
+*.class
+*.dll
+*.exe
+*/rdoc/
+
+# Testing #
+###########
+.watchr
+.rspec
+spec/*
+spec/fixtures/*
+test/*
+features/*
+Guardfile
+Procfile
+
+# SCM #
+#######
+.git
+*/.git
+.gitignore
+.gitmodules
+.gitconfig
+.gitattributes
+.svn
+*/.bzr/*
+*/.hg/*
+*/.svn/*
+
+# Berkshelf #
+#############
+Berksfile
+Berksfile.lock
+cookbooks/*
+tmp
+
+# Cookbooks #
+#############
+CONTRIBUTING
+CHANGELOG*
+
+# Strainer #
+############
+Colanderfile
+Strainerfile
+.colander
+.strainer
+
+# Vagrant #
+###########
+.vagrant
+Vagrantfile
+
+# Travis #
+##########
+.travis.yml
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/metadata.rb
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/metadata.rb (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/VirtualBox/metadata.rb 2014-05-20 14:46:29 UTC (rev 8380)
@@ -0,0 +1,20 @@
+name 'bigdata'
+maintainer 'Daniel Mekonnen'
+maintainer_email 'daniel<no-spam-at>systap.com'
+license 'GNU GPLv2'
+description 'Installs/Configures Systap Bigdata High Availability'
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version '0.1.3'
+
+depends 'apt'
+depends 'java', '>= 1.22.0'
+depends 'ant'
+depends 'tomcat'
+depends 'subversion'
+#
+# The lvm cookbook breaks a virtualbox launch, so commented out here:
+#
+# depends 'lvm'
+depends 'hadoop'
+depends 'emacs'
+depends 'sysstat'
Deleted: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/aws.rc
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/aws.rc 2014-05-20 13:53:26 UTC (rev 8379)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/aws.rc 2014-05-20 14:46:29 UTC (rev 8380)
@@ -1,45 +0,0 @@
-#
-# Set your organization's AWS access credentials here:
-#
-export AWS_ACCESS_KEY_ID="YOUR AWS ACCESS KEY ID"
-export AWS_SECRET_ACCESS_KEY="YOUR AWS SECRET ACCESS KEY"
-export AWS_SSH_PRIVATE_KEY="/path/to/your/private_key.pem"
-export AWS_KEYPAIR_NAME="YOUR AWS KEYPAIR NAME"
-
-
-#
-# Add a single security group here (a list will be supported later).
-# The security group must minimally allow outside access to ports 22 and 8080.
-#
-# SSH TCP 22 0.0.0.0/0
-# Custom TCP Rule TCP 8080 0.0.0.0/0
-#
-export AWS_SECURITY_GROUPS="YOUR AWS SECURITY GROUP"
-
-
-#
-# Adjust as desired:
-#
-export AWS_REGION="us-east-1"
-
-
-#
-# Ubuntu 12.04 settings:
-#
-export AWS_AMI="ami-59a4a230"
-export AWS_AMI_USERNAME="ubuntu"
-
-
-#
-# The SSD configuration assumes the m3.xlarge size. The SSD recipe should work for
-# SSD devices (not more than two) of any size, but has not been tested.
-#
-export AWS_INSTANCE_TYPE="m3.xlarge"
-
-
-#
-# Default host names, adjust as desired:
-#
-export BIGDATA_HA_HOST_A="bigdataA"
-export BIGDATA_HA_HOST_B="bigdataB"
-export BIGDATA_HA_HOST_C="bigdataC"
Deleted: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/chefignore
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/chefignore 2014-05-20 13:53:26 UTC (rev 8379)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/chefignore 2014-05-20 14:46:29 UTC (rev 8380)
@@ -1,96 +0,0 @@
-# Put files/directories that should be ignored in this file when uploading
-# or sharing to the community site.
-# Lines that start with '# ' are comments.
-
-# OS generated files #
-######################
-.DS_Store
-Icon?
-nohup.out
-ehthumbs.db
-Thumbs.db
-
-# SASS #
-########
-.sass-cache
-
-# EDITORS #
-###########
-\#*
-.#*
-*~
-*.sw[a-z]
-*.bak
-REVISION
-TAGS*
-tmtags
-*_flymake.*
-*_flymake
-*.tmproj
-.project
-.settings
-mkmf.log
-
-## COMPILED ##
-##############
-a.out
-*.o
-*.pyc
-*.so
-*.com
-*.class
-*.dll
-*.exe
-*/rdoc/
-
-# Testing #
-###########
-.watchr
-.rspec
-spec/*
-spec/fixtures/*
-test/*
-features/*
-Guardfile
-Procfile
-
-# SCM #
-#######
-.git
-*/.git
-.gitignore
-.gitmodules
-.gitconfig
-.gitattributes
-.svn
-*/.bzr/*
-*/.hg/*
-*/.svn/*
-
-# Berkshelf #
-#############
-Berksfile
-Berksfile.lock
-cookbooks/*
-tmp
-
-# Cookbooks #
-#############
-CONTRIBUTING
-CHANGELOG*
-
-# Strainer #
-############
-Colanderfile
-Strainerfile
-.colander
-.strainer
-
-# Vagrant #
-###########
-.vagrant
-Vagrantfile
-
-# Travis #
-##########
-.travis.yml
Deleted: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/metadata.rb
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/metadata.rb 2014-05-20 13:53:26 UTC (rev 8379)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/metadata.rb 2014-05-20 14:46:29 UTC (rev 8380)
@@ -1,17 +0,0 @@
-name 'bigdata'
-maintainer 'Daniel Mekonnen'
-maintainer_email 'daniel<no-spam-at>systap.com'
-license 'GNU GPLv2'
-description 'Installs/Configures Systap Bigdata High Availability'
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '0.1.3'
-
-depends 'apt'
-depends 'java', '>= 1.22.0'
-depends 'ant'
-depends 'tomcat'
-depends 'subversion'
-depends 'lvm'
-depends 'hadoop'
-depends 'emacs'
-depends 'sysstat'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2014-05-20 13:53:28
|
Revision: 8379
http://sourceforge.net/p/bigdata/code/8379
Author: thompsonbry
Date: 2014-05-20 13:53:26 +0000 (Tue, 20 May 2014)
Log Message:
-----------
1.3.1 release.
Added Paths:
-----------
tags/BIGDATA_RELEASE_1_3_1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2014-05-20 13:52:32
|
Revision: 8378
http://sourceforge.net/p/bigdata/code/8378
Author: thompsonbry
Date: 2014-05-20 13:52:28 +0000 (Tue, 20 May 2014)
Log Message:
-----------
bumping the version number for the 1.3.1 release.
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/build.properties
Modified: branches/BIGDATA_RELEASE_1_3_0/build.properties
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/build.properties 2014-05-20 13:47:52 UTC (rev 8377)
+++ branches/BIGDATA_RELEASE_1_3_0/build.properties 2014-05-20 13:52:28 UTC (rev 8378)
@@ -91,12 +91,12 @@
release.dir=ant-release
# The build version (note: 0.82b -> 0.82.0); 0.83.2 is followed by 1.0.0
-build.ver=1.3.0
+build.ver=1.3.1
build.ver.osgi=1.0
# Set true to do a snapshot build. This changes the value of ${version} to
# include the date.
-snapshot=true
+snapshot=false
# Javadoc build may be disabled using this property. The javadoc target will
# not be executed unless this property is defined (its value does not matter).
@@ -158,7 +158,7 @@
# dumps with Sun jdk1.6.0_07 and FC6 on a 32-bit platform.
#
#JAVA_HOME=C:\\Program Files\\Java\\jdk1.6.0_10
-JAVA_HOME=/usr/java/jdk1.7.0_25
+JAVA_HOME=/usr/java/jdk1.7.0_55
#JAVA_HOME=/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64
#JAVA_HOME=/usr/java/jrockit-R27.3.0-jdk1.6.0_01
@@ -285,7 +285,7 @@
# Note: java.util.logging messages DO NOT get written onto this logger -- only
# log4j messages.
#
-LOG4J_SOCKET_LOGGER_HOST = bigdata01.systap.com
+LOG4J_SOCKET_LOGGER_HOST = bigdata01.bigdata.com
LOG4J_SOCKET_LOGGER_PORT = 4445
# The socket logger uses a DailyRollingFileAppender by default and this
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2014-05-20 13:47:55
|
Revision: 8377
http://sourceforge.net/p/bigdata/code/8377
Author: thompsonbry
Date: 2014-05-20 13:47:52 +0000 (Tue, 20 May 2014)
Log Message:
-----------
Modified to stage the javadoc as well.
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/build.xml
branches/BIGDATA_RELEASE_1_3_0/src/resources/HAJournal/README
Modified: branches/BIGDATA_RELEASE_1_3_0/build.xml
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/build.xml 2014-05-20 13:28:29 UTC (rev 8376)
+++ branches/BIGDATA_RELEASE_1_3_0/build.xml 2014-05-20 13:47:52 UTC (rev 8377)
@@ -408,7 +408,7 @@
encoding="utf-8"
private="false"
>
- <arg value="-J-Xmx1000m" />
+ <arg value="-J-Xmx2000m" />
<arg value="-quiet" />
<packageset dir="${bigdata.dir}/bigdata/src/java" />
<packageset dir="${bigdata.dir}/bigdata/src/samples" />
@@ -917,7 +917,7 @@
<!-- -->
<target name="stage"
description="stages resources (jar, config, policy, logging files) needed to package or execute the bigdata distribution."
- depends="jar">
+ depends="jar, javadoc">
<!-- Create staging directories -->
<property name="dist.dir" location="${bigdata.dir}/dist/bigdata" />
@@ -933,6 +933,7 @@
<property name="dist.var.config.jini" location="${dist.var.config}/jini" />
<property name="dist.var.jetty" location="${dist.var}/jetty" />
<property name="dist.doc" location="${dist.dir}/doc" />
+ <property name="dist.doc.api" location="${dist.dir}/doc/api" />
<property name="dist.doc.legal" location="${dist.dir}/doc/LEGAL" />
<delete dir="${dist.dir}" quiet="true" />
@@ -947,6 +948,7 @@
<mkdir dir="${dist.var.config.logging}" />
<mkdir dir="${dist.var.config.jini}" />
<mkdir dir="${dist.doc}" />
+ <mkdir dir="${dist.doc.api}" />
<mkdir dir="${dist.doc.legal}" />
<mkdir dir="${dist.dir}/etc" />
<mkdir dir="${dist.dir}/etc/init.d" />
@@ -1232,12 +1234,18 @@
</fileset>
</copy>
- <!-- Stage top-level license file and copyright NOTICE file. -->
+ <!-- Stage top-level license file and copyright NOTICE file. -->
<copy toDir="${dist.doc}">
<fileset file="${bigdata.dir}/LICENSE.txt"/>
<fileset file="${bigdata.dir}/NOTICE"/>
</copy>
+ <!-- Stage javadoc (iff generated). -->
+ <copy toDir="${dist.doc.api}" failonerror="false">
+ <fileset dir="${build.dir}/docs/api">
+ </fileset>
+ </copy>
+
<!-- Stage license files for dependencies (LEGAL). -->
<copy toDir="${dist.doc.legal}" flatten="true">
<fileset dir="${bigdata.dir}">
@@ -1245,11 +1253,11 @@
</fileset>
</copy>
- <!-- Stage README. -->
+ <!-- Stage README. -->
<copy file="${src.resources}/HAJournal/README"
todir="${dist.dir}/doc" />
- <!-- Stage documentation from the wiki. -->
+ <!-- Stage documentation from the wiki. -->
<get dest="${dist.doc}/HAJournalServer.html" ignoreerrors="true"
src="http://wiki.bigdata.com/wiki/index.php/HAJournalServer?printable=yes"
/>
@@ -1299,10 +1307,11 @@
bigdata/var/jetty - the webapp.
bigdata/var/jetty/jetty.xml - jetty server configuration.
bigdata/var/jetty/bigdata/WEB-INF/web.xml - webapp configuration.
+ bigdata/doc - documentation
bigdata/doc/LEGAL - license files for dependencies.
bigdata/doc/LICENSE.txt - bigdata license file.
bigdata/doc/NOTICE - copyright NOTICE files.
- bigdata/doc/docs - javadoc (FIXME INSTALL JAVADOC, HA wiki page)
+ bigdata/doc/api - javadoc
bigdata/etc/init.d/bigdataHA - HA services start/stop script.
bigdata/etc/default/bigdataHA - HA services required config file.
Modified: branches/BIGDATA_RELEASE_1_3_0/src/resources/HAJournal/README
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/src/resources/HAJournal/README 2014-05-20 13:28:29 UTC (rev 8376)
+++ branches/BIGDATA_RELEASE_1_3_0/src/resources/HAJournal/README 2014-05-20 13:47:52 UTC (rev 8377)
@@ -1,5 +1,7 @@
Bigdata Highly Available Replication Cluster
+*** See the HAJournalServer on the wiki for more information ***
+
========== INSTALL ==========
0. The nodes MUST have synchronized clocks, both for logging and to
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2014-05-20 13:28:33
|
Revision: 8376
http://sourceforge.net/p/bigdata/code/8376
Author: thompsonbry
Date: 2014-05-20 13:28:29 +0000 (Tue, 20 May 2014)
Log Message:
-----------
added google adsense to the generated javadoc.
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/build.xml
Modified: branches/BIGDATA_RELEASE_1_3_0/build.xml
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/build.xml 2014-05-20 12:50:45 UTC (rev 8375)
+++ branches/BIGDATA_RELEASE_1_3_0/build.xml 2014-05-20 13:28:29 UTC (rev 8376)
@@ -406,33 +406,49 @@
windowtitle="bigdata® v${build.ver}"
classpathref="build.classpath"
encoding="utf-8"
- private="false"
+ private="false"
>
- <arg value="-J-Xmx1000m" />
+ <arg value="-J-Xmx1000m" />
<arg value="-quiet" />
- <packageset dir="${bigdata.dir}/bigdata/src/java" />
- <packageset dir="${bigdata.dir}/bigdata/src/samples" />
- <packageset dir="${bigdata.dir}/bigdata-jini/src/java" />
- <packageset dir="${bigdata.dir}/bigdata-rdf/src/java" />
- <packageset dir="${bigdata.dir}/bigdata-rdf/src/samples" />
- <packageset dir="${bigdata.dir}/bigdata-sails/src/java" />
- <packageset dir="${bigdata.dir}/bigdata-blueprints/src/java" />
- <packageset dir="${bigdata.dir}/bigdata-sails/src/samples" />
+ <packageset dir="${bigdata.dir}/bigdata/src/java" />
+ <packageset dir="${bigdata.dir}/bigdata/src/samples" />
+ <packageset dir="${bigdata.dir}/bigdata-jini/src/java" />
+ <packageset dir="${bigdata.dir}/bigdata-rdf/src/java" />
+ <packageset dir="${bigdata.dir}/bigdata-rdf/src/samples" />
+ <packageset dir="${bigdata.dir}/bigdata-sails/src/java" />
+ <packageset dir="${bigdata.dir}/bigdata-blueprints/src/java" />
+ <packageset dir="${bigdata.dir}/bigdata-sails/src/samples" />
<packageset dir="${bigdata.dir}/bigdata-gom/src/java" />
<packageset dir="${bigdata.dir}/bigdata-gom/src/samples" />
<packageset dir="${bigdata.dir}/bigdata-gas/src/java" />
- <packageset dir="${bigdata.dir}/ctc-striterators/src/java" />
- <doctitle>
+ <packageset dir="${bigdata.dir}/ctc-striterators/src/java" />
+ <doctitle>
<![CDATA[<h1>bigdata® v${build.ver}</h1>]]></doctitle>
- <bottom>
- <![CDATA[<i>Copyright © 2006-2014 SYSTAP, LLC. All Rights Reserved.</i>]]></bottom>
+ <bottom>
+ <![CDATA[<i>Copyright © 2006-2014 SYSTAP, LLC. All Rights Reserved.</i>
+<script>
+jQuery(document).ready(function(){
+ jQuery('ul.sf-menu').superfish({
+ pathClass: 'current',
+ cssArrows: false
+ });
+});
+
+(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+ga('create', 'UA-50971023-1', 'bigdata.com');
+ga('send', 'pageview');
+</script>
+]]></bottom>
<tag name="todo" scope="all" description="TODO:" />
<tag name="issue" scope="all" description="ISSUE:" />
<!--tag name="FIXME" scope="all" description="FIXME:"/-->
<link href="http://download.oracle.com/javase/7/docs/api/" />
<link href="http://openrdf.callimachus.net/sesame/2.7/apidocs/" />
<link href="http://lucene.apache.org/java/3_0_0/api/"/>
- <link href="http://lucene.apache.org/core/old_versioned_docs/versions/3_0_3/api/all/"/>
+ <link href="http://lucene.apache.org/core/old_versioned_docs/versions/3_0_3/api/all/"/>
<link href="http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/"/>
<link href="http://hc.apache.org/httpcomponents-core-ga/httpcore-nio/apidocs/"/>
<link href="http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2014-05-20 12:50:49
|
Revision: 8375
http://sourceforge.net/p/bigdata/code/8375
Author: thompsonbry
Date: 2014-05-20 12:50:45 +0000 (Tue, 20 May 2014)
Log Message:
-----------
Avoid
{{{
java.lang.IllegalStateException: Unknown transaction
at com.bigdata.service.AbstractTransactionService.abort(AbstractTransactionService.java:2028)
at sun.reflect.GeneratedMethodAccessor19.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at net.jini.jeri.BasicInvocationDispatcher.invoke(BasicInvocationDispatcher.java:1126)
at net.jini.jeri.BasicInvocationDispatcher.dispatch(BasicInvocationDispatcher.java:608)
at com.sun.jini.jeri.internal.runtime.Target$2.run(Target.java:487)
at net.jini.export.ServerContext.doWithServerContext(ServerContext.java:108)
at com.sun.jini.jeri.internal.runtime.Target.dispatch(Target.java:484)
at com.sun.jini.jeri.internal.runtime.Target.access$000(Target.java:57)
at com.sun.jini.jeri.internal.runtime.Target$1.run(Target.java:464)
at java.security.AccessController.doPrivileged(Native Method)
at com.sun.jini.jeri.internal.runtime.Target.dispatch(Target.java:461)
at com.sun.jini.jeri.internal.runtime.Target.dispatch(Target.java:426)
at com.sun.jini.jeri.internal.runtime.DgcRequestDispatcher.dispatch(DgcRequestDispatcher.java:210)
at net.jini.jeri.connection.ServerConnectionManager$Dispatcher.dispatch(ServerConnectionManager.java:147)
at com.sun.jini.jeri.internal.mux.MuxServer$1$1.run(MuxServer.java:244)
at java.security.AccessController.doPrivileged(Native Method)
at com.sun.jini.jeri.internal.mux.MuxServer$1.run(MuxServer.java:241)
at com.sun.jini.thread.ThreadPool$Worker.run(ThreadPool.java:136)
at java.lang.Thread.run(Thread.java:745)
at com.sun.jini.jeri.internal.runtime.Util.__________EXCEPTION_RECEIVED_FROM_SERVER__________(Util.java:108)
at com.sun.jini.jeri.internal.runtime.Util.exceptionReceivedFromServer(Util.java:101)
at net.jini.jeri.BasicInvocationHandler.unmarshalThrow(BasicInvocationHandler.java:1303)
at net.jini.jeri.BasicInvocationHandler.invokeRemoteMethodOnce(BasicInvocationHandler.java:832)
at net.jini.jeri.BasicInvocationHandler.invokeRemoteMethod(BasicInvocationHandler.java:659)
at net.jini.jeri.BasicInvocationHandler.invoke(BasicInvocationHandler.java:528)
at com.sun.proxy.$Proxy7.abort(Unknown Source)
at com.bigdata.rdf.sail.webapp.BigdataRDFServletContextListener.contextDestroyed(BigdataRDFServletContextListener.java:472)
at org.eclipse.jetty.server.handler.ContextHandler.callContextDestroyed(ContextHandler.java:807)
at org.eclipse.jetty.servlet.ServletContextHandler.callContextDestroyed(ServletContextHandler.java:459)
at org.eclipse.jetty.server.handler.ContextHandler.doStop(ContextHandler.java:841)
at org.eclipse.jetty.servlet.ServletContextHandler.doStop(ServletContextHandler.java:217)
at org.eclipse.jetty.webapp.WebAppContext.doStop(WebAppContext.java:521)
at org.eclipse.jetty.util.component.AbstractLifeCycle.stop(AbstractLifeCycle.java:89)
at org.eclipse.jetty.util.component.ContainerLifeCycle.stop(ContainerLifeCycle.java:136)
at org.eclipse.jetty.util.component.ContainerLifeCycle.doStop(ContainerLifeCycle.java:155)
at org.eclipse.jetty.server.handler.AbstractHandler.doStop(AbstractHandler.java:71)
at org.eclipse.jetty.util.component.AbstractLifeCycle.stop(AbstractLifeCycle.java:89)
at org.eclipse.jetty.util.component.ContainerLifeCycle.stop(ContainerLifeCycle.java:136)
at org.eclipse.jetty.util.component.ContainerLifeCycle.doStop(ContainerLifeCycle.java:155)
at org.eclipse.jetty.server.handler.AbstractHandler.doStop(AbstractHandler.java:71)
at org.eclipse.jetty.util.component.AbstractLifeCycle.stop(AbstractLifeCycle.java:89)
at org.eclipse.jetty.util.component.ContainerLifeCycle.stop(ContainerLifeCycle.java:136)
at org.eclipse.jetty.util.component.ContainerLifeCycle.doStop(ContainerLifeCycle.java:155)
at org.eclipse.jetty.server.handler.AbstractHandler.doStop(AbstractHandler.java:71)
at org.eclipse.jetty.server.Server.doStop(Server.java:426)
at org.eclipse.jetty.util.component.AbstractLifeCycle.stop(AbstractLifeCycle.java:89)
at com.bigdata.rdf.sail.webapp.NanoSparqlServer.awaitServerStart(NanoSparqlServer.java:505)
at com.bigdata.rdf.sail.webapp.NanoSparqlServer.main(NanoSparqlServer.java:441)
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServletContextListener.java
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServletContextListener.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServletContextListener.java 2014-05-20 12:43:54 UTC (rev 8374)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServletContextListener.java 2014-05-20 12:50:45 UTC (rev 8375)
@@ -464,9 +464,9 @@
rdfContext = null;
}
-
- if (txs != null && readLock != null) {
+ if (txs != null && readLock != null && readLock != -1L) {
+
try {
txs.abort(readLockTx);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2014-05-20 12:43:57
|
Revision: 8374
http://sourceforge.net/p/bigdata/code/8374
Author: thompsonbry
Date: 2014-05-20 12:43:54 +0000 (Tue, 20 May 2014)
Log Message:
-----------
added test for #944. This only fails in scale-out.
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestUnions.java
Added Paths:
-----------
branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_944.rq
branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_944.srx
branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_944.trig
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestUnions.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestUnions.java 2014-05-20 12:28:40 UTC (rev 8373)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestUnions.java 2014-05-20 12:43:54 UTC (rev 8374)
@@ -259,4 +259,34 @@
}
+ /**
+ * This is DAWG sparql11-subquery-05. It fails in scale-out.
+ *
+ * <pre>
+ * SELECT *
+ * WHERE {
+ * {
+ * SELECT ?s
+ * WHERE {?s ?p ?o}
+ * LIMIT 1
+ * }
+ * {?s ?p ?o}
+ * UNION
+ * {}
+ * }
+ * </pre>
+ *
+ * @throws Exception
+ */
+ public void test_union_ticket_944() throws Exception {
+
+ new TestHelper(
+ "ticket_944", // testURI,
+ "ticket_944.rq",// queryFileURL
+ "ticket_944.trig",// dataFileURL
+ "ticket_944.srx"// resultFileURL
+ ).runTest();
+
+ }
+
}
Added: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_944.rq
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_944.rq (rev 0)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_944.rq 2014-05-20 12:43:54 UTC (rev 8374)
@@ -0,0 +1,11 @@
+SELECT *
+WHERE {
+ {
+ SELECT ?s
+ WHERE {?s ?p ?o}
+ LIMIT 1
+ }
+ {?s ?p ?o}
+ UNION
+ {}
+}
Added: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_944.srx
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_944.srx (rev 0)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_944.srx 2014-05-20 12:43:54 UTC (rev 8374)
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
+ <head>
+ <variable name='s'/>
+ <variable name='p'/>
+ <variable name='o'/>
+ </head>
+ <results>
+ <result>
+ <binding name='s'>
+ <uri>http://example.org/a0</uri>
+ </binding>
+ <binding name='p'>
+ <uri>http://example.org/p0</uri>
+ </binding>
+ <binding name='o'>
+ <literal>a0+p0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name='s'>
+ <uri>http://example.org/a0</uri>
+ </binding>
+ <binding name='p'>
+ <uri>http://example.org/p1</uri>
+ </binding>
+ <binding name='o'>
+ <literal>a0+p1</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name='s'>
+ <uri>http://example.org/a0</uri>
+ </binding>
+ </result>
+ </results>
+</sparql>
Added: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_944.trig
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_944.trig (rev 0)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_944.trig 2014-05-20 12:43:54 UTC (rev 8374)
@@ -0,0 +1,7 @@
+@prefix : <http://example.org/> .
+
+<file:/tmp/sparql-1.1-evaluation5799/testcases-sparql-1.1/subquery/data-04.ttl>{
+:a1 :p2 "a1+p2" .
+:a0 :p1 "a0+p1" .
+:a0 :p0 "a0+p0" .
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2014-05-20 12:28:43
|
Revision: 8373
http://sourceforge.net/p/bigdata/code/8373
Author: thompsonbry
Date: 2014-05-20 12:28:40 +0000 (Tue, 20 May 2014)
Log Message:
-----------
removed stderr in tests.
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlClient2.java
branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestService794.java
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlClient2.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlClient2.java 2014-05-20 12:25:27 UTC (rev 8372)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlClient2.java 2014-05-20 12:28:40 UTC (rev 8373)
@@ -70,7 +70,7 @@
final URI systap = new URIImpl("bd:/sytap");
//
- System.err.println(m_serviceURL);
+ log.warn(m_serviceURL);
final Graph ontology = new GraphImpl();
ontology.add(person, RDFS.SUBCLASSOF, entity);
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestService794.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestService794.java 2014-05-20 12:25:27 UTC (rev 8372)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestService794.java 2014-05-20 12:28:40 UTC (rev 8373)
@@ -59,12 +59,12 @@
* @param args
* @throws IOException
*/
- private void abstactAskService(String ... args) throws IOException {
+ private void abstactAskService(final String ... args) throws IOException {
setMethodisPostUrlEncodedData();
serviceRequest("update","PREFIX eg: <http://example.com/a#> INSERT { eg:a eg:p \"rs123\" ; eg:q 123, 100 } WHERE {}");
- StringBuilder bld = new StringBuilder();
+ final StringBuilder bld = new StringBuilder();
// Set the base URI to be our sparql end point, for re-entrant queries,
// using the idiom SERVICE <>
bld.append("base <");
@@ -75,9 +75,9 @@
bld.append(arg);
}
- System.err.println(bld.toString());
- String result = serviceRequest("query",bld.toString());
- System.err.println(result);
+ if(log.isInfoEnabled()) log.info(bld.toString());
+ final String result = serviceRequest("query",bld.toString());
+ if(log.isInfoEnabled()) log.info(result);
assertTrue(result.contains("true"));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2014-05-20 12:25:29
|
Revision: 8372
http://sourceforge.net/p/bigdata/code/8372
Author: thompsonbry
Date: 2014-05-20 12:25:27 +0000 (Tue, 20 May 2014)
Log Message:
-----------
the slash is reserved by zookeeper for a path name and can not appear in a bigdata namespace in scale-out
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestMultiTenancyAPI.java
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestMultiTenancyAPI.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestMultiTenancyAPI.java 2014-05-20 12:21:08 UTC (rev 8371)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestMultiTenancyAPI.java 2014-05-20 12:25:27 UTC (rev 8372)
@@ -309,7 +309,7 @@
* It can not appear in a bigdata namespace in scale-out.
*/
// final String namespace2 = "kb2-" + UUID.randomUUID() + "-&/<>-foo";
- final String namespace2 = "kb2-" + UUID.randomUUID() + "-&/<>-foo";
+ final String namespace2 = "kb2-" + UUID.randomUUID() + "-&<>-foo";
doTestCreate(namespace2);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2014-05-20 12:21:11
|
Revision: 8371
http://sourceforge.net/p/bigdata/code/8371
Author: thompsonbry
Date: 2014-05-20 12:21:08 +0000 (Tue, 20 May 2014)
Log Message:
-----------
the slash is reserved by zookeeper for a path name and can not appear in a bigdata namespace in scale-out
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestMultiTenancyAPI.java
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestMultiTenancyAPI.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestMultiTenancyAPI.java 2014-05-20 12:04:04 UTC (rev 8370)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestMultiTenancyAPI.java 2014-05-20 12:21:08 UTC (rev 8371)
@@ -304,7 +304,11 @@
* The properties are mostly inherited from the default configuration,
* but the namespace of the new data set is explicitly set for the
* CREATE operation.
+ *
+ * Note: The '/' character is reserved by zookeeper for a path separator.
+ * It can not appear in a bigdata namespace in scale-out.
*/
+// final String namespace2 = "kb2-" + UUID.randomUUID() + "-&/<>-foo";
final String namespace2 = "kb2-" + UUID.randomUUID() + "-&/<>-foo";
doTestCreate(namespace2);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2014-05-20 12:04:10
|
Revision: 8370
http://sourceforge.net/p/bigdata/code/8370
Author: thompsonbry
Date: 2014-05-20 12:04:04 +0000 (Tue, 20 May 2014)
Log Message:
-----------
Avoid negative timeout when remaining has decremented to LT zero.
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniCoreServicesConfiguration.java
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniCoreServicesConfiguration.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniCoreServicesConfiguration.java 2014-05-19 21:44:35 UTC (rev 8369)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniCoreServicesConfiguration.java 2014-05-20 12:04:04 UTC (rev 8370)
@@ -431,12 +431,23 @@
long remaining = nanos;
- while (remaining > 0 && registrars.length < maxCount) {
+ while (registrars.length < maxCount) {
remaining = nanos - (System.nanoTime() - begin);
+
+ if (remaining <= 0) {
+
+ // Note: Avoids negative timeout fo signal.wait().
+ break;
+
+ }
if (log.isDebugEnabled())
- log.debug("remaining: " + remaining);
+ log.debug("timeout="
+ + TimeUnit.NANOSECONDS.toMillis(timeout)
+ + "ms, remaining: "
+ + TimeUnit.NANOSECONDS.toMillis(remaining)
+ + "ms, #registrars=" + registrars.length);
synchronized (signal) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2014-05-19 21:44:37
|
Revision: 8369
http://sourceforge.net/p/bigdata/code/8369
Author: thompsonbry
Date: 2014-05-19 21:44:35 +0000 (Mon, 19 May 2014)
Log Message:
-----------
Fix to excluded/included tests in scale-out
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataFederationSparqlTest.java
branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataFederationSparqlTest.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataFederationSparqlTest.java 2014-05-19 21:42:58 UTC (rev 8368)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataFederationSparqlTest.java 2014-05-19 21:44:35 UTC (rev 8369)
@@ -39,6 +39,7 @@
import org.openrdf.repository.Repository;
import org.openrdf.repository.dataset.DatasetRepository;
+import com.bigdata.BigdataStatics;
import com.bigdata.btree.keys.CollatorEnum;
import com.bigdata.btree.keys.KeyBuilder;
import com.bigdata.btree.keys.StrengthEnum;
@@ -103,7 +104,12 @@
if(hideDatasetTests)
suite1 = BigdataSparqlTest.filterOutTests(suite1,"dataset");
- suite1 = BigdataSparqlTest.filterOutTests(suite1, "property-paths");
+ suite1 = BigdataSparqlTest.filterOutTests(suite1, BigdataSparqlTest.badTests);
+
+ if (!BigdataStatics.runKnownBadTests)
+ suite1 = BigdataSparqlTest.filterOutTests(suite1, BigdataSparqlTest.knownBadTests);
+
+ // suite1 = BigdataSparqlTest.filterOutTests(suite1, "property-paths");
/**
* BSBM BI use case query 5
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java 2014-05-19 21:42:58 UTC (rev 8368)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java 2014-05-19 21:44:35 UTC (rev 8369)
@@ -107,7 +107,7 @@
/**
* The tests test things that are no longer in the spec.
*/
- static final Collection<String> badTests = Arrays.asList(new String[] {
+ static final public Collection<String> badTests = Arrays.asList(new String[] {
"http://www.w3.org/2001/sw/DataAccess/tests/data-r2/syntax-sparql1/manifest#sparql11-sequence-04",
"http://www.w3.org/2001/sw/DataAccess/tests/data-r2/syntax-sparql1/manifest#sparql11-sequence-05",
"http://www.w3.org/2001/sw/DataAccess/tests/data-r2/syntax-sparql1/manifest#sparql11-sequence-06",
@@ -118,7 +118,7 @@
* {@link BigdataStatics#runKnownBadTests}. This is done as a convenience to
* 'green' up CI.
*/
- static final Collection<String> knownBadTests = Arrays.asList(new String[] {
+ static final public Collection<String> knownBadTests = Arrays.asList(new String[] {
"http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-datatype-2",
"http://www.w3.org/2001/sw/DataAccess/tests/data-r2/syntax-sparql1/manifest#sparql11-wildcard-cycles-04",
"http://www.w3.org/2001/sw/DataAccess/tests/data-r2/syntax-sparql1/manifest#sparql11-subquery-04",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2014-05-19 21:43:02
|
Revision: 8368
http://sourceforge.net/p/bigdata/code/8368
Author: thompsonbry
Date: 2014-05-19 21:42:58 +0000 (Mon, 19 May 2014)
Log Message:
-----------
cluster specific fix for property path evaluation.
See #942
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUtility.java
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUtility.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUtility.java 2014-05-19 18:52:25 UTC (rev 8367)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUtility.java 2014-05-19 21:42:58 UTC (rev 8368)
@@ -2308,9 +2308,36 @@
final JoinGroupNode subgroup = (JoinGroupNode) alpNode.subgroup();
// Convert the child join group.
- final PipelineOp subquery = convertJoinGroup(null,
+ PipelineOp subquery = convertJoinGroup(null/*left*/,
subgroup, doneSet, ctx, false/* needsEndOp */);
+ if (ctx.isCluster()) {
+
+ /**
+ * Note: This is necessary if the first operator in the query plan
+ * is a sharded join and we want it to run using a sharded index
+ * view. Without this, the operator will actually run against the
+ * global index view.
+ * <p>
+ * Note: There may be other ways to "fix" this. See the ticket for
+ * more information.
+ *
+ * @see <a href="http://trac.bigdata.com/ticket/478" > Cluster does
+ * not map input solution(s) across shards </a>
+ * @see <a href="http://trac.bigdata.com/ticket/942" > Property path
+ * errors in scale-out </a>
+ */
+
+ subquery = applyQueryHints(
+ new StartOp(BOp.NOARGS, NV.asMap(new NV[] {//
+ new NV(Predicate.Annotations.BOP_ID, ctx
+ .nextId()),
+ new NV(SliceOp.Annotations.EVALUATION_CONTEXT,
+ BOpEvaluationContext.CONTROLLER), })),
+ alpNode, ctx);
+
+ }
+
final IVariableOrConstant<?> leftTerm =
(IVariableOrConstant<?>) alpNode.left().getValueExpression();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2014-05-19 18:52:29
|
Revision: 8367
http://sourceforge.net/p/bigdata/code/8367
Author: thompsonbry
Date: 2014-05-19 18:52:25 +0000 (Mon, 19 May 2014)
Log Message:
-----------
organized imports.
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/jini/start/process/JiniCoreServicesProcessHelper.java
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/jini/start/process/JiniCoreServicesProcessHelper.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/jini/start/process/JiniCoreServicesProcessHelper.java 2014-05-19 18:51:58 UTC (rev 8366)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/jini/start/process/JiniCoreServicesProcessHelper.java 2014-05-19 18:52:25 UTC (rev 8367)
@@ -41,8 +41,6 @@
import com.bigdata.service.jini.JiniClientConfig;
import com.bigdata.service.jini.util.LookupStarter;
import com.bigdata.util.config.NicUtil;
-import com.bigdata.service.jini.util.LookupStarter;
-import com.bigdata.util.config.NicUtil;
/**
* Class for starting the jini services.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2014-05-19 18:52:04
|
Revision: 8366
http://sourceforge.net/p/bigdata/code/8366
Author: thompsonbry
Date: 2014-05-19 18:51:58 +0000 (Mon, 19 May 2014)
Log Message:
-----------
Attempting to debug a cluster start issue.
JiniCoreServicesConfiguration: modified to provide more information @ DEBUG and to use notifyAll() (suspect a lost signal).
JiniCoreServicesProcessHelper: javdoc only.
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniCoreServicesConfiguration.java
branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/jini/start/process/JiniCoreServicesProcessHelper.java
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniCoreServicesConfiguration.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniCoreServicesConfiguration.java 2014-05-19 18:02:41 UTC (rev 8365)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniCoreServicesConfiguration.java 2014-05-19 18:51:58 UTC (rev 8366)
@@ -380,9 +380,9 @@
*
* @throws IOException
*/
- static public ServiceRegistrar[] getServiceRegistrars(int maxCount,
+ static public ServiceRegistrar[] getServiceRegistrars(final int maxCount,
final String[] groups, final LookupLocator[] locators,
- long timeout, final TimeUnit unit) throws InterruptedException,
+ final long timeout, final TimeUnit unit) throws InterruptedException,
IOException {
final Object signal = new Object();
@@ -394,7 +394,8 @@
*/
new DiscoveryListener() {
- public void discarded(DiscoveryEvent e) {
+ @Override
+ public void discarded(final DiscoveryEvent e) {
if(log.isDebugEnabled())
log.debug("discarded: "+e);
@@ -403,14 +404,15 @@
}
- public void discovered(DiscoveryEvent e) {
+ @Override
+ public void discovered(final DiscoveryEvent e) {
if(log.isDebugEnabled())
log.debug("discovered: "+e);
synchronized (signal) {
- signal.notify();
+ signal.notifyAll();
}
@@ -433,6 +435,9 @@
remaining = nanos - (System.nanoTime() - begin);
+ if (log.isDebugEnabled())
+ log.debug("remaining: " + remaining);
+
synchronized (signal) {
try {
@@ -446,7 +451,7 @@
}
if(log.isDebugEnabled())
- log.debug("woke up.");
+ log.debug("woke up");
}
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/jini/start/process/JiniCoreServicesProcessHelper.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/jini/start/process/JiniCoreServicesProcessHelper.java 2014-05-19 18:02:41 UTC (rev 8365)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/jini/start/process/JiniCoreServicesProcessHelper.java 2014-05-19 18:51:58 UTC (rev 8366)
@@ -149,8 +149,8 @@
*/
final ServiceRegistrar[] registrars = JiniCoreServicesConfiguration
.getServiceRegistrars(Integer.MAX_VALUE/* maxCount */,
- clientConfig.groups, clientConfig.locators, 1500,
- TimeUnit.MILLISECONDS);
+ clientConfig.groups, clientConfig.locators,
+ 1500/* timeout */, TimeUnit.MILLISECONDS);
if (log.isInfoEnabled())
log.info("registrars: #found=" + registrars.length + ", #desired="
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2014-05-19 18:02:43
|
Revision: 8365
http://sourceforge.net/p/bigdata/code/8365
Author: thompsonbry
Date: 2014-05-19 18:02:41 +0000 (Mon, 19 May 2014)
Log Message:
-----------
bumped the zookeeper version.
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/pom.xml
Modified: branches/BIGDATA_RELEASE_1_3_0/pom.xml
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/pom.xml 2014-05-19 17:42:46 UTC (rev 8364)
+++ branches/BIGDATA_RELEASE_1_3_0/pom.xml 2014-05-19 18:02:41 UTC (rev 8365)
@@ -75,7 +75,7 @@
<!-- few subtle differences. See build.properties for details. -->
<!-- -->
<icu.version>4.8</icu.version>
- <zookeeper.version>3.3.3</zookeeper.version>
+ <zookeeper.version>3.4.5</zookeeper.version>
<sesame.version>2.6.10</sesame.version>
<slf4j.version>1.6.1</slf4j.version>
<jetty.version>9.1.4.v20140401</jetty.version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dme...@us...> - 2014-05-19 17:42:48
|
Revision: 8364
http://sourceforge.net/p/bigdata/code/8364
Author: dmekonnen
Date: 2014-05-19 17:42:46 +0000 (Mon, 19 May 2014)
Log Message:
-----------
set ec2-user as the user dir in the mapgraph build path
Modified Paths:
--------------
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/chef/attributes/default.rb
Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/chef/attributes/default.rb
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/chef/attributes/default.rb 2014-05-19 17:37:57 UTC (rev 8363)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/chef/attributes/default.rb 2014-05-19 17:42:46 UTC (rev 8364)
@@ -155,4 +155,4 @@
default['mapgraph'][:svn_branch] = "https://svn.code.sf.net/p/mpgraph/code/trunk"
# MapGraph code retrieved from subversion will be downloaded to the "source_dir" directory:
-default['mapgraph'][:source_dir] = "/home/ubuntu/mapgraph-code"
+default['mapgraph'][:source_dir] = "/home/ec2-user/mapgraph-code"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dme...@us...> - 2014-05-19 17:38:00
|
Revision: 8363
http://sourceforge.net/p/bigdata/code/8363
Author: dmekonnen
Date: 2014-05-19 17:37:57 +0000 (Mon, 19 May 2014)
Log Message:
-----------
adding Vagrnt file for mapgraph and recipe fix
Modified Paths:
--------------
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/chef/recipes/mapgraph.rb
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss.build-from-svn
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat.build-from-svn
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.dual-provider.tomcat
Added Paths:
-----------
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.mapgraph
Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/chef/recipes/mapgraph.rb
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/chef/recipes/mapgraph.rb 2014-05-19 17:11:33 UTC (rev 8362)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/chef/recipes/mapgraph.rb 2014-05-19 17:37:57 UTC (rev 8363)
@@ -15,10 +15,10 @@
# Make sure the Bigdata home directory is owned by the bigdata user and group:
#
execute "pull mapgraph from svn repo" do
- user 'ubuntu'
- group 'ubuntu'
- cwd "/home/ubuntu"
- command "svn checkout #{default['mapgraph'][:svn_branch]} #{node['mapgraph'][:source_dir]}"
+ user 'ec2-user'
+ group 'ec2-user'
+ cwd "/home/ec2-user"
+ command "svn checkout #{node['mapgraph'][:svn_branch]} #{node['mapgraph'][:source_dir]}"
end
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.mapgraph
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.mapgraph (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.mapgraph 2014-05-19 17:37:57 UTC (rev 8363)
@@ -0,0 +1,69 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# Vagrantfile.aws.mapgraph
+#
+# The launch synopsis for this Vagrantfile:
+#
+# % source ./aws.rc
+# % vagrant up
+#
+ENV['VAGRANT_DEFAULT_PROVIDER'] = 'aws'
+
+Vagrant.require_plugin "vagrant-berkshelf"
+
+Vagrant.configure("2") do |config|
+ config.ssh.pty = true
+ config.vm.box = "dummy"
+ config.vm.hostname = ENV['BIGDATA_HA_HOST_A']
+
+ config.berkshelf.enabled = true
+
+ config.vm.provider :aws do |aws, override|
+ aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
+ aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+ aws.keypair_name = ENV['AWS_KEYPAIR_NAME']
+
+ aws.ami = "ami-41e7ce28"
+
+ # Amazon Linux AMI with NVIDIA GRID GPU Driver
+ #
+ # https://aws.amazon.com/marketplace/pp/B00FYCDDTE?ref=cns_srchrow
+ #
+ aws.region = ENV['AWS_REGION']
+ aws.instance_type = "g2.2xlarge"
+ aws.security_groups = [ ENV['AWS_SECURITY_GROUPS'], ENV['AWS_SECURITY_GROUP_PRIVATE'] ]
+
+ aws.tags = {
+ 'Name' => ENV['BIGDATA_HA_HOST_A']
+ }
+
+ override.ssh.username = "ec2-user"
+ override.ssh.private_key_path = ENV['AWS_SSH_PRIVATE_KEY']
+ end
+
+
+ config.vm.provision :chef_solo do |chef|
+ chef.json = {
+ :java => {
+ "install_flavor" => "oracle",
+ :jdk_version => "7",
+ :oracle => { 'accept_oracle_download_terms' => true }
+ }
+ }
+
+$script = <<SCRIPT
+ yum -y update
+ sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash
+ yum -y groupinstall "Development Tools"
+SCRIPT
+
+ config.vm.provision :shell, inline: $script
+
+ chef.run_list = [
+ "recipe[emacs]",
+ "recipe[bigdata::mapgraph]"
+ ]
+
+ end
+end
Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss 2014-05-19 17:11:33 UTC (rev 8362)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss 2014-05-19 17:37:57 UTC (rev 8363)
@@ -1,6 +1,8 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
#
+# Vagrantfile.aws.nss
+#
# The launch synopsis for this Vagrantfile:
#
# % source ./aws.rc
Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss.build-from-svn
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss.build-from-svn 2014-05-19 17:11:33 UTC (rev 8362)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss.build-from-svn 2014-05-19 17:37:57 UTC (rev 8363)
@@ -1,6 +1,8 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
#
+# Vagrantfile.aws.nss.build-from-svn
+#
# The launch synopsis for this Vagrantfile:
#
# % source ./aws.rc
Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat 2014-05-19 17:11:33 UTC (rev 8362)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat 2014-05-19 17:37:57 UTC (rev 8363)
@@ -1,6 +1,8 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
#
+# Vagrantfile.aws.tomcat
+#
# The launch synopsis for this Vagrantfile:
#
# % source ./aws.rc
Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat.build-from-svn
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat.build-from-svn 2014-05-19 17:11:33 UTC (rev 8362)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat.build-from-svn 2014-05-19 17:37:57 UTC (rev 8363)
@@ -1,6 +1,8 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
#
+# Vagrantfile.aws.tomcat.build-from-svn
+#
# The launch synopsis for this Vagrantfile:
#
# % source ./aws.rc
Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.dual-provider.tomcat
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.dual-provider.tomcat 2014-05-19 17:11:33 UTC (rev 8362)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.dual-provider.tomcat 2014-05-19 17:37:57 UTC (rev 8363)
@@ -1,6 +1,19 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
-# ENV['VAGRANT_DEFAULT_PROVIDER'] = 'aws'
+#
+# Vagrantfile.dual-provider.tomcat
+#
+# The launch synopsis for this Vagrantfile:
+#
+# VirtualBox provider:
+#
+# % vagrant up
+#
+# AWS provider:
+#
+# % source ./aws.rc
+# % vagrant up --provider=aws
+#
Vagrant.require_plugin "vagrant-berkshelf"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dme...@us...> - 2014-05-19 17:11:37
|
Revision: 8362
http://sourceforge.net/p/bigdata/code/8362
Author: dmekonnen
Date: 2014-05-19 17:11:33 +0000 (Mon, 19 May 2014)
Log Message:
-----------
Updates for vagrant-chef separation. Updates for Cookbook version 0.1.3.
Modified Paths:
--------------
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/chef/metadata.rb
Added Paths:
-----------
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/Vagrantfile
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/bin/
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/bin/createCluster.sh
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/bin/createSecurityGroup.py
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/bin/setHosts.py
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Berksfile
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Gemfile
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Thorfile
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss.build-from-svn
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat.build-from-svn
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.dual-provider.tomcat
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/aws.rc
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/chefignore
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/metadata.rb
Removed Paths:
-------------
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/
Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/chef/metadata.rb
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/chef/metadata.rb 2014-05-19 15:00:11 UTC (rev 8361)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/chef/metadata.rb 2014-05-19 17:11:33 UTC (rev 8362)
@@ -1,12 +1,17 @@
-name 'bigdata'
-maintainer 'Daniel Mekonnen'
+name 'bigdata'
+maintainer 'Daniel Mekonnen'
maintainer_email 'daniel<no-spam-at>systap.com'
-license 'GNU GPLv2'
-description 'Installs/Configures the Bigdata triple/graph store.'
+license 'GNU GPLv2'
+description 'Installs/Configures Systap Bigdata High Availability'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '0.1.2'
+version '0.1.3'
+
depends 'apt'
-depends 'java', '>= 1.22.0'
+depends 'java', '>= 1.22.0'
depends 'ant'
depends 'tomcat'
depends 'subversion'
+depends 'lvm'
+depends 'hadoop'
+depends 'emacs'
+depends 'sysstat'
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/Vagrantfile
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/Vagrantfile (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/Vagrantfile 2014-05-19 17:11:33 UTC (rev 8362)
@@ -0,0 +1,203 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# This vagrant file is meant to be launched by the bin/createCluster.sh script.
+#
+ENV['VAGRANT_DEFAULT_PROVIDER'] = 'aws'
+
+Vagrant.require_plugin "vagrant-berkshelf"
+
+Vagrant.configure("2") do |config|
+ # All Vagrant configuration is done here. The most common configuration
+ # options are documented and commented below. For a complete reference,
+ # please see the online documentation at vagrantup.com.
+
+config.vm.define :bigdataA do |bigdataA|
+ bigdataA.vm.box = "dummy"
+ bigdataA.vm.hostname = ENV['BIGDATA_HA_HOST_A']
+
+ bigdataA.berkshelf.enabled = true
+
+ bigdataA.vm.provider :aws do |aws, override|
+ aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
+ aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+ aws.keypair_name = ENV['AWS_KEYPAIR_NAME']
+
+ aws.ami = ENV['AWS_AMI']
+
+ aws.block_device_mapping = [
+ {
+ :DeviceName => "/dev/sdb",
+ :VirtualName => "ephemeral0"
+ },
+ {
+ :DeviceName => "/dev/sdc",
+ :VirtualName => "ephemeral1"
+ }
+ ]
+
+ aws.region = ENV['AWS_REGION']
+ aws.instance_type = ENV['AWS_INSTANCE_TYPE']
+ aws.security_groups = [ ENV['AWS_SECURITY_GROUPS'], ENV['AWS_SECURITY_GROUP_PRIVATE'] ]
+
+ aws.tags = {
+ 'Name' => ENV['BIGDATA_HA_HOST_A']
+ }
+
+ override.ssh.username = ENV['AWS_AMI_USERNAME']
+ override.ssh.private_key_path = ENV['AWS_SSH_PRIVATE_KEY']
+ end
+
+ bigdataA.vm.provision :chef_solo do |chef|
+ chef.json = {
+ :bigdata => {
+ :install_flavor => "ha"
+ },
+ :java => {
+ :install_flavor => "oracle",
+ :jdk_version => "7",
+ :oracle => { 'accept_oracle_download_terms' => true }
+ },
+ :zookeeper => {
+ :zoocfg => { :clientPort=> '2081' }
+ }
+ }
+
+ bigdataA.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
+
+ chef.run_list = [
+ "recipe[bigdata::ssd]",
+ "recipe[bigdata::high_availability]"
+ ]
+
+ end
+
+end # bigdataA
+
+
+config.vm.define :bigdataB do |bigdataB|
+ bigdataB.vm.box = "dummy"
+ bigdataB.vm.hostname = ENV['BIGDATA_HA_HOST_B']
+
+ bigdataB.berkshelf.enabled = true
+
+ bigdataB.vm.provider :aws do |aws, override|
+ aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
+ aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+ aws.keypair_name = ENV['AWS_KEYPAIR_NAME']
+
+ aws.ami = ENV['AWS_AMI']
+
+ aws.block_device_mapping = [
+ {
+ :DeviceName => "/dev/sdb",
+ :VirtualName => "ephemeral0"
+ },
+ {
+ :DeviceName => "/dev/sdc",
+ :VirtualName => "ephemeral1"
+ }
+ ]
+
+ aws.region = ENV['AWS_REGION']
+ aws.instance_type = ENV['AWS_INSTANCE_TYPE']
+ aws.security_groups = [ ENV['AWS_SECURITY_GROUPS'], ENV['AWS_SECURITY_GROUP_PRIVATE'] ]
+
+ aws.tags = {
+ 'Name' => ENV['BIGDATA_HA_HOST_B']
+ }
+
+ override.ssh.username = ENV['AWS_AMI_USERNAME']
+ override.ssh.private_key_path = ENV['AWS_SSH_PRIVATE_KEY']
+ end
+
+ bigdataB.vm.provision :chef_solo do |chef|
+ chef.json = {
+ :bigdata => {
+ :install_flavor => "ha"
+ },
+ :java => {
+ :install_flavor => "oracle",
+ :jdk_version => "7",
+ :oracle => { 'accept_oracle_download_terms' => true }
+ },
+ :zookeeper => {
+ :zoocfg => { :clientPort=> '2081' }
+ }
+ }
+
+ bigdataB.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
+
+ chef.run_list = [
+ "recipe[bigdata::ssd]",
+ "recipe[bigdata::high_availability]"
+ ]
+
+ end
+
+end # bigdataB
+
+
+config.vm.define :bigdataC do |bigdataC|
+ bigdataC.vm.box = "dummy"
+ bigdataC.vm.hostname = ENV['BIGDATA_HA_HOST_C']
+
+ bigdataC.berkshelf.enabled = true
+
+ bigdataC.vm.provider :aws do |aws, override|
+ aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
+ aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+ aws.keypair_name = ENV['AWS_KEYPAIR_NAME']
+
+ aws.ami = ENV['AWS_AMI']
+
+ aws.block_device_mapping = [
+ {
+ :DeviceName => "/dev/sdb",
+ :VirtualName => "ephemeral0"
+ },
+ {
+ :DeviceName => "/dev/sdc",
+ :VirtualName => "ephemeral1"
+ }
+ ]
+
+ aws.region = ENV['AWS_REGION']
+ aws.instance_type = ENV['AWS_INSTANCE_TYPE']
+ aws.security_groups = [ ENV['AWS_SECURITY_GROUPS'], ENV['AWS_SECURITY_GROUP_PRIVATE'] ]
+
+ aws.tags = {
+ 'Name' => ENV['BIGDATA_HA_HOST_C']
+ }
+
+ override.ssh.username = ENV['AWS_AMI_USERNAME']
+ override.ssh.private_key_path = ENV['AWS_SSH_PRIVATE_KEY']
+ end
+
+ bigdataC.vm.provision :chef_solo do |chef|
+ chef.json = {
+ :bigdata => {
+ :install_flavor => "ha"
+ },
+ :java => {
+ :install_flavor => "oracle",
+ :jdk_version => "7",
+ :oracle => { 'accept_oracle_download_terms' => true }
+ },
+ :zookeeper => {
+ :zoocfg => { :clientPort=> '2081' }
+ }
+ }
+
+ bigdataC.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
+
+ chef.run_list = [
+ "recipe[bigdata::ssd]",
+ "recipe[bigdata::high_availability]"
+ ]
+
+ end
+
+end # bigdataC
+
+end
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/bin/createCluster.sh
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/bin/createCluster.sh (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/bin/createCluster.sh 2014-05-19 17:11:33 UTC (rev 8362)
@@ -0,0 +1,20 @@
+#! /bin/sh
+
+export PYTHONPATH=/usr/local/lib/python2.7/site-packages
+
+source aws.rc
+python ./bin/createSecurityGroup.py
+source .aws_security_group
+rm .aws_security_group
+vagrant up
+#
+# Occassionally AWS has timeout issues. If this occurs, launch the cluster instances individually:
+#
+# vagrant up bigdataA
+# echo "\nbigdataA is up\n"
+# vagrant up bigdataB
+# echo "\nbigdataB is up\n"
+# vagrant up bigdataC
+# echo "\nbigdataC is up\n"
+echo "Vagrant up completed. Setting host names..."
+python ./bin/setHosts.py
Property changes on: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/bin/createCluster.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/bin/createSecurityGroup.py
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/bin/createSecurityGroup.py (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/bin/createSecurityGroup.py 2014-05-19 17:11:33 UTC (rev 8362)
@@ -0,0 +1,22 @@
+#! /usr/bin/python
+
+import os
+from boto import ec2
+from boto.manage.cmdshell import sshclient_from_instance
+import paramiko
+from datetime import datetime
+
+
+if __name__ == '__main__':
+
+ # create a security group fo this cluster only. Just create it now so that it can be associated with the new
+ # instance at create time. Add rules to this group once the instance IP addresses are known.
+
+ ec2conn = ec2.connection.EC2Connection( os.environ["AWS_ACCESS_KEY_ID"], os.environ["AWS_SECRET_ACCESS_KEY"] )
+
+ group_name = "BDHA " + str( datetime.utcnow() )
+
+ group = ec2conn.create_security_group( group_name, "BigdataHA Security Group" )
+
+ envFile = open( ".aws_security_group", "w" )
+ envFile.write( 'export AWS_SECURITY_GROUP_PRIVATE="' + group_name + '"')
Property changes on: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/bin/createSecurityGroup.py
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/bin/setHosts.py
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/bin/setHosts.py (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/bin/setHosts.py 2014-05-19 17:11:33 UTC (rev 8362)
@@ -0,0 +1,99 @@
+#! /usr/bin/python
+
+import os
+import sys
+from boto import ec2
+from boto.manage.cmdshell import sshclient_from_instance
+import paramiko
+
+bigdataA = os.environ["BIGDATA_HA_HOST_A"]
+bigdataB = os.environ["BIGDATA_HA_HOST_B"]
+bigdataC = os.environ["BIGDATA_HA_HOST_C"]
+
+hostMap = {}
+bigdataHosts = [None] * 3
+
+def createHostAdditions( instances ):
+ hostsAdd = "\n"
+ for instance in instances:
+ data = instance.__dict__
+ if bigdataA in data['tags']['Name']:
+ bigdataHosts[0] = instance
+ hostsAdd += data[ 'private_ip_address' ] + "\\t" + bigdataA + "\\n"
+ hostMap[ bigdataA ] = data[ 'private_ip_address' ]
+ elif bigdataB in data['tags']['Name']:
+ bigdataHosts[1] = instance
+ hostsAdd += data[ 'private_ip_address' ] + "\\t" + bigdataB + "\\n"
+ hostMap[ bigdataB ] = data[ 'private_ip_address' ]
+ elif bigdataC in data['tags']['Name']:
+ bigdataHosts[2] = instance
+ hostsAdd += data[ 'private_ip_address' ] + "\\t" + bigdataC + "\\n"
+ hostMap[ bigdataC ] = data[ 'private_ip_address' ]
+
+ return hostsAdd
+
+def createZookeeperSubstitution( index, host, ipAddress ):
+ return "sudo sed -i 's|server." + index + "=" + host + "|server." + index + "=" + ipAddress + "|' /etc/zookeeper/conf/zoo.cfg"
+
+def createJiniLocatorsSubstitution():
+ locators = ""
+ for host in hostMap:
+ locators = locators + "jini://" + hostMap[host] + "/,"
+ locators = locators[:-1]
+ return "sudo sed -i 's|%JINI_LOCATORS%|" + locators + "|' /etc/default/bigdataHA"
+
+if __name__ == '__main__':
+
+ ec2conn = ec2.connection.EC2Connection( os.environ["AWS_ACCESS_KEY_ID"], os.environ["AWS_SECRET_ACCESS_KEY"] )
+ runningFilter = {'instance-state-name':'running'} # only running states
+ reservations = ec2conn.get_all_instances( filters=runningFilter )
+ instances = [i for r in reservations for i in r.instances]
+
+ hostsAdd = createHostAdditions( instances )
+
+ # Create an SSH client for our instance
+ # key_path is the path to the SSH private key associated with instance
+ # user_name is the user to login as on the instance (e.g. ubuntu, ec2-user, etc.)
+ key_path = os.environ["AWS_SSH_PRIVATE_KEY"]
+
+ private_security_group_name = os.environ["AWS_SECURITY_GROUP_PRIVATE"]
+ group = ec2conn.get_all_security_groups( private_security_group_name )[0]
+
+ jini_locators = createJiniLocatorsSubstitution()
+ # print "JINI_LOCATORS = " + jini_locators
+
+ i = 1
+ for host in bigdataHosts:
+ ssh_client = sshclient_from_instance( host, key_path, user_name='ubuntu' )
+ # ssh_client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+
+ # Run the command. Returns a tuple consisting of:
+ # The integer status of the command
+ # A string containing the output of the command
+ # A string containing the stderr output of the command
+ status, stdin, stderr = ssh_client.run( "sudo sh -c 'echo \"" + hostsAdd + "\" >> /etc/hosts'" )
+ status, stdin, stderr = ssh_client.run( "sudo sh -c 'echo " + str(i) + " > /var/lib/zookeeper/myid'" )
+ status, stdin, stderr = ssh_client.run( createZookeeperSubstitution( "1", bigdataA, hostMap[ bigdataA ] ) )
+ status, stdin, stderr = ssh_client.run( createZookeeperSubstitution( "2", bigdataB, hostMap[ bigdataB ] ) )
+ status, stdin, stderr = ssh_client.run( createZookeeperSubstitution( "3", bigdataC, hostMap[ bigdataC ] ) )
+
+ status, stdin, stderr = ssh_client.run( jini_locators )
+
+ hostAddress = host.__dict__['private_ip_address'] + "/32"
+ group.authorize( ip_protocol="tcp", from_port="0", to_port="65535", cidr_ip=hostAddress, src_group=None )
+
+ i += 1
+ #
+ # startHAServices does not exit as expected, so remote restart commands will hang.
+ # As a work around, we restart the host:
+ #
+ print "Running: sudo /etc/init.d/zookeeper-server restart on host ", host
+ status, stdin, stderr = ssh_client.run( "sudo /etc/init.d/zookeeper-server restart" )
+ print "Running: sudo /etc/init.d/bigdata restart on host ", host
+ status, stdin, stderr = ssh_client.run( "sudo /etc/init.d/bigdataHA restart" )
+ # status, stdin, stderr = ssh_client.run( "sudo service bigdataHA restart" )
+ # host.reboot()
+
+ print "The hosts are now rebooting, this may take several minutes. \nOnce back up, you may confirm status by visiting:\n"
+ for host in bigdataHosts:
+ print "\thttp://" + host.__dict__['ip_address'] + ":8080/bigdata/status\n"
Property changes on: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/bigdata-aws-ha3-launcher/bin/setHosts.py
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Berksfile
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Berksfile (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Berksfile 2014-05-19 17:11:33 UTC (rev 8362)
@@ -0,0 +1,13 @@
+site :opscode
+
+cookbook "apt"
+cookbook 'java', '~> 1.22.0'
+cookbook 'ant'
+cookbook 'tomcat'
+cookbook 'subversion'
+cookbook 'lvm'
+cookbook "hadoop"
+cookbook "emacs"
+cookbook "sysstat"
+
+metadata
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Gemfile
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Gemfile (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Gemfile 2014-05-19 17:11:33 UTC (rev 8362)
@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'berkshelf'
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Thorfile
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Thorfile (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Thorfile 2014-05-19 17:11:33 UTC (rev 8362)
@@ -0,0 +1,5 @@
+# encoding: utf-8
+
+require 'bundler'
+require 'bundler/setup'
+require 'berkshelf/thor'
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss 2014-05-19 17:11:33 UTC (rev 8362)
@@ -0,0 +1,62 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# The launch synopsis for this Vagrantfile:
+#
+# % source ./aws.rc
+# % vagrant up
+#
+ENV['VAGRANT_DEFAULT_PROVIDER'] = 'aws'
+
+Vagrant.require_plugin "vagrant-berkshelf"
+
+Vagrant.configure("2") do |config|
+ config.vm.box = "dummy"
+ config.vm.hostname = ENV['BIGDATA_HA_HOST_A']
+
+ config.berkshelf.enabled = true
+
+ config.vm.provider :aws do |aws, override|
+ aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
+ aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+ aws.keypair_name = ENV['AWS_KEYPAIR_NAME']
+
+ aws.ami = ENV['AWS_AMI']
+
+ aws.region = ENV['AWS_REGION']
+ aws.instance_type = ENV['AWS_INSTANCE_TYPE']
+ aws.security_groups = [ ENV['AWS_SECURITY_GROUPS'], ENV['AWS_SECURITY_GROUP_PRIVATE'] ]
+
+ aws.tags = {
+ 'Name' => ENV['BIGDATA_HA_HOST_A']
+ }
+
+ override.ssh.username = ENV['AWS_AMI_USERNAME']
+ override.ssh.private_key_path = ENV['AWS_SSH_PRIVATE_KEY']
+ end
+
+
+ config.vm.provision :chef_solo do |chef|
+ chef.json = {
+ :bigdata => {
+ :install_flavor => "nss",
+ :build_from_svn => false
+ },
+ :java => {
+ "install_flavor" => "oracle",
+ :jdk_version => "7",
+ :oracle => { 'accept_oracle_download_terms' => true }
+ },
+ :tomcat => {
+ :base_version => "7"
+ }
+ }
+
+ config.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
+
+ chef.run_list = [
+ "recipe[bigdata::nss]"
+ ]
+
+ end
+end
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss.build-from-svn
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss.build-from-svn (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.nss.build-from-svn 2014-05-19 17:11:33 UTC (rev 8362)
@@ -0,0 +1,62 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# The launch synopsis for this Vagrantfile:
+#
+# % source ./aws.rc
+# % vagrant up
+#
+ENV['VAGRANT_DEFAULT_PROVIDER'] = 'aws'
+
+Vagrant.require_plugin "vagrant-berkshelf"
+
+Vagrant.configure("2") do |config|
+ config.vm.box = "dummy"
+ config.vm.hostname = ENV['BIGDATA_HA_HOST_A']
+
+ config.berkshelf.enabled = true
+
+ config.vm.provider :aws do |aws, override|
+ aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
+ aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+ aws.keypair_name = ENV['AWS_KEYPAIR_NAME']
+
+ aws.ami = ENV['AWS_AMI']
+
+ aws.region = ENV['AWS_REGION']
+ aws.instance_type = ENV['AWS_INSTANCE_TYPE']
+ aws.security_groups = [ ENV['AWS_SECURITY_GROUPS'], ENV['AWS_SECURITY_GROUP_PRIVATE'] ]
+
+ aws.tags = {
+ 'Name' => ENV['BIGDATA_HA_HOST_A']
+ }
+
+ override.ssh.username = ENV['AWS_AMI_USERNAME']
+ override.ssh.private_key_path = ENV['AWS_SSH_PRIVATE_KEY']
+ end
+
+
+ config.vm.provision :chef_solo do |chef|
+ chef.json = {
+ :bigdata => {
+ :install_flavor => "nss",
+ :build_from_svn => true
+ },
+ :java => {
+ "install_flavor" => "oracle",
+ :jdk_version => "7",
+ :oracle => { 'accept_oracle_download_terms' => true }
+ },
+ :tomcat => {
+ :base_version => "7"
+ }
+ }
+
+ config.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
+
+ chef.run_list = [
+ "recipe[bigdata::nss]"
+ ]
+
+ end
+end
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat 2014-05-19 17:11:33 UTC (rev 8362)
@@ -0,0 +1,62 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# The launch synopsis for this Vagrantfile:
+#
+# % source ./aws.rc
+# % vagrant up
+#
+ENV['VAGRANT_DEFAULT_PROVIDER'] = 'aws'
+
+Vagrant.require_plugin "vagrant-berkshelf"
+
+Vagrant.configure("2") do |config|
+ config.vm.box = "dummy"
+ config.vm.hostname = ENV['BIGDATA_HA_HOST_A']
+
+ config.berkshelf.enabled = true
+
+ config.vm.provider :aws do |aws, override|
+ aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
+ aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+ aws.keypair_name = ENV['AWS_KEYPAIR_NAME']
+
+ aws.ami = ENV['AWS_AMI']
+
+ aws.region = ENV['AWS_REGION']
+ aws.instance_type = ENV['AWS_INSTANCE_TYPE']
+ aws.security_groups = [ ENV['AWS_SECURITY_GROUPS'], ENV['AWS_SECURITY_GROUP_PRIVATE'] ]
+
+ aws.tags = {
+ 'Name' => ENV['BIGDATA_HA_HOST_A']
+ }
+
+ override.ssh.username = ENV['AWS_AMI_USERNAME']
+ override.ssh.private_key_path = ENV['AWS_SSH_PRIVATE_KEY']
+ end
+
+
+ config.vm.provision :chef_solo do |chef|
+ chef.json = {
+ :bigdata => {
+ :install_flavor => "tomcat",
+ :build_from_svn => false
+ },
+ :java => {
+ "install_flavor" => "oracle",
+ :jdk_version => "7",
+ :oracle => { 'accept_oracle_download_terms' => true }
+ },
+ :tomcat => {
+ :base_version => "7"
+ }
+ }
+
+ config.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
+
+ chef.run_list = [
+ "recipe[bigdata::tomcat]"
+ ]
+
+ end
+end
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat.build-from-svn
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat.build-from-svn (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.aws.tomcat.build-from-svn 2014-05-19 17:11:33 UTC (rev 8362)
@@ -0,0 +1,62 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# The launch synopsis for this Vagrantfile:
+#
+# % source ./aws.rc
+# % vagrant up
+#
+ENV['VAGRANT_DEFAULT_PROVIDER'] = 'aws'
+
+Vagrant.require_plugin "vagrant-berkshelf"
+
+Vagrant.configure("2") do |config|
+ config.vm.box = "dummy"
+ config.vm.hostname = ENV['BIGDATA_HA_HOST_A']
+
+ config.berkshelf.enabled = true
+
+ config.vm.provider :aws do |aws, override|
+ aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
+ aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+ aws.keypair_name = ENV['AWS_KEYPAIR_NAME']
+
+ aws.ami = ENV['AWS_AMI']
+
+ aws.region = ENV['AWS_REGION']
+ aws.instance_type = ENV['AWS_INSTANCE_TYPE']
+ aws.security_groups = [ ENV['AWS_SECURITY_GROUPS'], ENV['AWS_SECURITY_GROUP_PRIVATE'] ]
+
+ aws.tags = {
+ 'Name' => ENV['BIGDATA_HA_HOST_A']
+ }
+
+ override.ssh.username = ENV['AWS_AMI_USERNAME']
+ override.ssh.private_key_path = ENV['AWS_SSH_PRIVATE_KEY']
+ end
+
+
+ config.vm.provision :chef_solo do |chef|
+ chef.json = {
+ :bigdata => {
+ :install_flavor => "tomcat",
+ :build_from_svn => true
+ },
+ :java => {
+ "install_flavor" => "oracle",
+ :jdk_version => "7",
+ :oracle => { 'accept_oracle_download_terms' => true }
+ },
+ :tomcat => {
+ :base_version => "7"
+ }
+ }
+
+ config.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
+
+ chef.run_list = [
+ "recipe[bigdata::tomcat]"
+ ]
+
+ end
+end
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.dual-provider.tomcat
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.dual-provider.tomcat (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/Vagrantfile.dual-provider.tomcat 2014-05-19 17:11:33 UTC (rev 8362)
@@ -0,0 +1,71 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+# ENV['VAGRANT_DEFAULT_PROVIDER'] = 'aws'
+
+Vagrant.require_plugin "vagrant-berkshelf"
+
+Vagrant.configure("2") do |config|
+ #
+ # By default, the VirtualBox provider will be launched.
+ # Defaults are set for the VirtualBox assumption.
+ #
+ config.vm.box = "precise64"
+ config.vm.hostname = "bigdata"
+
+ config.berkshelf.enabled = true
+
+ config.vm.provider :virtualbox do |vb|
+ vb.vm.box_url = "http://files.vagrantup.com/precise64.box"
+
+ vb.vm.network :private_network, ip: "33.33.33.10"
+ end
+
+ #
+ # The AWS provider will be used specified at the command line as per:
+ # % vagrant up --provider=aws
+ #
+ config.vm.provider :aws do |aws, override|
+ override.vm.box = "dummy"
+ aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
+ aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+ aws.keypair_name = ENV['AWS_KEYPAIR_NAME']
+
+ aws.ami = ENV['AWS_AMI']
+
+ aws.region = ENV['AWS_REGION']
+ aws.instance_type = ENV['AWS_INSTANCE_TYPE']
+ aws.security_groups = [ ENV['AWS_SECURITY_GROUPS'], ENV['AWS_SECURITY_GROUP_PRIVATE'] ]
+
+ aws.tags = {
+ 'Name' => ENV['BIGDATA_HA_HOST_A']
+ }
+
+ override.ssh.username = ENV['AWS_AMI_USERNAME']
+ override.ssh.private_key_path = ENV['AWS_SSH_PRIVATE_KEY']
+ end
+
+
+ config.vm.provision :chef_solo do |chef|
+ chef.json = {
+ :bigdata => {
+ :install_flavor => "tomcat",
+ :build_from_svn => false
+ },
+ :java => {
+ :install_flavor => "oracle",
+ :jdk_version => "7",
+ :oracle => { 'accept_oracle_download_terms' => true }
+ },
+ :tomcat => {
+ :base_version => "7"
+ }
+ }
+
+ config.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
+
+ chef.run_list = [
+ "recipe[bigdata::tomcat]"
+ ]
+
+ end
+end
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/aws.rc
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/aws.rc (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/aws.rc 2014-05-19 17:11:33 UTC (rev 8362)
@@ -0,0 +1,45 @@
+#
+# Set your organization's AWS access credentials here:
+#
+export AWS_ACCESS_KEY_ID="YOUR AWS ACCESS KEY ID"
+export AWS_SECRET_ACCESS_KEY="YOUR AWS SECRET ACCESS KEY"
+export AWS_SSH_PRIVATE_KEY="/path/to/your/private_key.pem"
+export AWS_KEYPAIR_NAME="YOUR AWS KEYPAIR NAME"
+
+
+#
+# Add a single security group here (a list will be supported later).
+# The security group must minimally allow outside access to ports 22 and 8080.
+#
+# SSH TCP 22 0.0.0.0/0
+# Custom TCP Rule TCP 8080 0.0.0.0/0
+#
+export AWS_SECURITY_GROUPS="YOUR AWS SECURITY GROUP"
+
+
+#
+# Adjust as desired:
+#
+export AWS_REGION="us-east-1"
+
+
+#
+# Ubuntu 12.04 settings:
+#
+export AWS_AMI="ami-59a4a230"
+export AWS_AMI_USERNAME="ubuntu"
+
+
+#
+# The SSD configuration assumes the m3.xlarge size. The SSD recipe should work for
+# SSD devices (not more than two) of any size, but has not been tested.
+#
+export AWS_INSTANCE_TYPE="m3.xlarge"
+
+
+#
+# Default host names, adjust as desired:
+#
+export BIGDATA_HA_HOST_A="bigdataA"
+export BIGDATA_HA_HOST_B="bigdataB"
+export BIGDATA_HA_HOST_C="bigdataC"
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/chefignore
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/chefignore (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/chefignore 2014-05-19 17:11:33 UTC (rev 8362)
@@ -0,0 +1,96 @@
+# Put files/directories that should be ignored in this file when uploading
+# or sharing to the community site.
+# Lines that start with '# ' are comments.
+
+# OS generated files #
+######################
+.DS_Store
+Icon?
+nohup.out
+ehthumbs.db
+Thumbs.db
+
+# SASS #
+########
+.sass-cache
+
+# EDITORS #
+###########
+\#*
+.#*
+*~
+*.sw[a-z]
+*.bak
+REVISION
+TAGS*
+tmtags
+*_flymake.*
+*_flymake
+*.tmproj
+.project
+.settings
+mkmf.log
+
+## COMPILED ##
+##############
+a.out
+*.o
+*.pyc
+*.so
+*.com
+*.class
+*.dll
+*.exe
+*/rdoc/
+
+# Testing #
+###########
+.watchr
+.rspec
+spec/*
+spec/fixtures/*
+test/*
+features/*
+Guardfile
+Procfile
+
+# SCM #
+#######
+.git
+*/.git
+.gitignore
+.gitmodules
+.gitconfig
+.gitattributes
+.svn
+*/.bzr/*
+*/.hg/*
+*/.svn/*
+
+# Berkshelf #
+#############
+Berksfile
+Berksfile.lock
+cookbooks/*
+tmp
+
+# Cookbooks #
+#############
+CONTRIBUTING
+CHANGELOG*
+
+# Strainer #
+############
+Colanderfile
+Strainerfile
+.colander
+.strainer
+
+# Vagrant #
+###########
+.vagrant
+Vagrantfile
+
+# Travis #
+##########
+.travis.yml
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/metadata.rb
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/metadata.rb (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/samples/metadata.rb 2014-05-19 17:11:33 UTC (rev 8362)
@@ -0,0 +1,17 @@
+name 'bigdata'
+maintainer 'Daniel Mekonnen'
+maintainer_email 'daniel<no-spam-at>systap.com'
+license 'GNU GPLv2'
+description 'Installs/Configures Systap Bigdata High Availability'
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version '0.1.3'
+
+depends 'apt'
+depends 'java', '>= 1.22.0'
+depends 'ant'
+depends 'tomcat'
+depends 'subversion'
+depends 'lvm'
+depends 'hadoop'
+depends 'emacs'
+depends 'sysstat'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2014-05-19 15:00:14
|
Revision: 8361
http://sourceforge.net/p/bigdata/code/8361
Author: thompsonbry
Date: 2014-05-19 15:00:11 +0000 (Mon, 19 May 2014)
Log Message:
-----------
Modified the HALoadBalancerServlet to provide more information about the root cause when there is a gateway error (a failure of the proxied request/response).
See #941 (HA LBS errors under heavy load).
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/HALoadBalancerServlet.java
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/HALoadBalancerServlet.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/HALoadBalancerServlet.java 2014-05-19 14:34:12 UTC (rev 8360)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/HALoadBalancerServlet.java 2014-05-19 15:00:11 UTC (rev 8361)
@@ -25,8 +25,10 @@
import java.io.IOException;
import java.net.URI;
import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicReference;
+import javax.servlet.AsyncContext;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
@@ -35,6 +37,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
+import org.eclipse.jetty.client.api.Response;
import org.eclipse.jetty.proxy.ProxyServlet;
import com.bigdata.BigdataStatics;
@@ -1152,6 +1155,49 @@
}
/**
+ * {@inheritDoc}
+ * <p>
+ * Overridden to provide more information about the error. The
+ * implementation is derived from the jetty 9.1.4 implementation of the
+ * method in the base {@link ProxyServlet} class, but logs @ ERROR so we can
+ * see more about the underlying problem.
+ *
+ * @see <a href="http://trac.bigdata.com/ticket/941" > HA LBS Gateway errors
+ * under heavy load </a>
+ *
+ * TODO jetty 9.2 provides a fully asynchronous proxy servlet. We will
+ * wind up replacing our base class with that implementation soon,
+ * probably for the 1.3.2 release. Until then, this will provide
+ * additional diagnoistic information about the root causes when there
+ * is a gateway error (proxying fails). If we can find some patterns to
+ * these failures, then it would be useful to recharacterize more of
+ * them to encourage the client to retry the request. Those semantics
+ * are not really available for 502 (Bad Gateway). They are more a
+ * appropriate for both 503 (Service Unavailable - temporary overload),
+ * and 504 (Gateway Timeout). 503 might be the best choice if there is
+ * not an explicit timeout and the root cause does not clearly indicate
+ * a durable problem with the target host.
+ */
+ @Override
+ protected void onResponseFailure(//
+ final HttpServletRequest request,//
+ final HttpServletResponse response,//
+ final Response proxyResponse,//
+ final Throwable failure) {
+
+ log.error(getRequestId(request) + " proxying failed: " + request, failure);
+ if (!response.isCommitted())
+ {
+ if (failure instanceof TimeoutException)
+ response.setStatus(HttpServletResponse.SC_GATEWAY_TIMEOUT);
+ else
+ response.setStatus(HttpServletResponse.SC_BAD_GATEWAY);
+ }
+ AsyncContext asyncContext = (AsyncContext)request.getAttribute(ASYNC_CONTEXT);
+ asyncContext.complete();
+ }
+
+ /**
* Return <code>true</code> iff this is an UPDATE request that must be
* proxied to the quorum leader.
* <p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2014-05-19 14:34:14
|
Revision: 8360
http://sourceforge.net/p/bigdata/code/8360
Author: thompsonbry
Date: 2014-05-19 14:34:12 +0000 (Mon, 19 May 2014)
Log Message:
-----------
updated release notes.
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/bigdata/src/releases/RELEASE_1_3_1.txt
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/releases/RELEASE_1_3_1.txt
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/releases/RELEASE_1_3_1.txt 2014-05-19 14:26:12 UTC (rev 8359)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/releases/RELEASE_1_3_1.txt 2014-05-19 14:34:12 UTC (rev 8360)
@@ -130,6 +130,7 @@
- http://trac.bigdata.com/ticket/915 (DefaultAnalyzerFactory issues)
- http://trac.bigdata.com/ticket/920 (Content negotiation orders accept header scores in reverse)
- http://trac.bigdata.com/ticket/939 (NSS does not start from command line: bigdata-war/src not found.)
+- http://trac.bigdata.com/ticket/940 (ProxyServlet in web.xml breaks tomcat WAR (HA LBS)
1.3.0:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
4 messages has been excluded from this view by a project administrator.
