incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1238787 - in /incubator/bigtop/branches/RCs: ./ bigtop-deploy/puppet/ bigtop-deploy/puppet/config/ bigtop-deploy/puppet/manifests/ bigtop-deploy/puppet/modules/bigtop_util/ bigtop-deploy/puppet/modules/bigtop_util/lib/ bigtop-deploy/puppet...
Date Tue, 31 Jan 2012 20:22:35 GMT
Author: rvs
Date: Tue Jan 31 20:22:33 2012
New Revision: 1238787

URL: http://svn.apache.org/viewvc?rev=1238787&view=rev
Log:
Bigtop 0.3.0 RC-1

Added:
    incubator/bigtop/branches/RCs/bigtop-deploy/puppet/README.md
    incubator/bigtop/branches/RCs/bigtop-deploy/puppet/config/
    incubator/bigtop/branches/RCs/bigtop-deploy/puppet/config/site.csv.example
    incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/bigtop_util/
    incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/bigtop_util/lib/
    incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/bigtop_util/lib/puppet/
    incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/bigtop_util/lib/puppet/parser/
    incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/bigtop_util/lib/puppet/parser/functions/
    incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/bigtop_util/lib/puppet/parser/functions/append_each.rb
      - copied, changed from r1229288, incubator/bigtop/branches/RCs/bigtop-packages/src/common/hbase/do-component-build
    incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/bigtop_util/lib/puppet/parser/functions/get_setting.rb
      - copied, changed from r1229288, incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/do-component-build
    incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/bigtop_util/manifests/
    incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/bigtop_util/manifests/init.pp
      - copied, changed from r1229288, incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/do-component-build
    incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/lib/facter/hadoop_storage_dirs.rb
    incubator/bigtop/branches/RCs/bigtop-packages/src/common/bigtop-utils/bigtop-utils.default
      - copied, changed from r1229288, incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/do-component-build
    incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/flume-node.init
      - copied, changed from r1229288, incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/flume/SOURCES/init.d.suse
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/flume-node.postinst
      - copied, changed from r1229288, incubator/bigtop/branches/RCs/bigtop-packages/src/common/hbase/do-component-build
Removed:
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/flume.manpages
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/service-init.d.tpl
    incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/flume/SOURCES/init.d
    incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/flume/SOURCES/init.d.suse
Modified:
    incubator/bigtop/branches/RCs/bigtop-deploy/puppet/manifests/cluster.pp
    incubator/bigtop/branches/RCs/bigtop-deploy/puppet/manifests/site.pp
    incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
    incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/templates/hdfs-site.xml
    incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml
    incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/templates/taskcontroller.cfg
    incubator/bigtop/branches/RCs/bigtop-deploy/vm/boxgrinder/bigtop_hadoop.appl
    incubator/bigtop/branches/RCs/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
    incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/do-component-build   (contents, props changed)
    incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/install_flume.sh   (contents, props changed)
    incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/do-component-build
    incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/install_hadoop.sh
    incubator/bigtop/branches/RCs/bigtop-packages/src/common/hbase/do-component-build
    incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper-server.sh
    incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/bigtop-utils/rules
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/control
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/flume.docs
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/rules
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hadoop/hadoop-conf-pseudo.postinst
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/hive.postinst
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/whirr/rules
    incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper-server.init
    incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec
    incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/flume/SPECS/flume.spec
    incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
    incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
    incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hive/SPECS/hive.spec
    incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
    incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec
    incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
    incubator/bigtop/branches/RCs/bigtop.mk

Added: incubator/bigtop/branches/RCs/bigtop-deploy/puppet/README.md
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/puppet/README.md?rev=1238787&view=auto
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-deploy/puppet/README.md (added)
+++ incubator/bigtop/branches/RCs/bigtop-deploy/puppet/README.md Tue Jan 31 20:22:33 2012
@@ -0,0 +1,43 @@
+# Puppet classes for deploying Hadoop
+
+## Configuration
+
+manifests/init.pp expects configuration to live in CSV at $confdir/config/site.csv, 
+which takes the form
+
+<pre>
+key,value[,value2,value3]
+</pre>
+
+An example is provided at config/site.csv.example.  These values are loaded using 
+puppet's extlookup() mechanism.
+
+Any options not defined there will revert to a default value defined in 
+manifests/cluster.pp, with the following exceptions (which are required):
+
+* hadoop\_head\_node: must be set to the FQDN of the name node of your cluster (which will also
+                    become its job tracker and gateway)
+* bigtop\_yumrepo\_uri: uri of a repository containing packages for hadoop as built by Bigtop.
+ 
+$confdir is the directory that puppet will look into for its configuration.  On most systems, 
+this will be either /etc/puppet/ or /etc/puppetlabs/puppet/.  You may override this value by 
+specifying --confdir=path/to/config/dir on the puppet command line.
+
+For other options that may be set here, look for calls to extlookup() in manifests/cluster.pp.
+Note that if hadoop\_storage\_dirs is left unset, puppet will attempt to guess which directories 
+to use.
+
+## Usage
+
+Make sure that the bigtop-deploy directory is available on every node of your cluster, and then 
+run the following on those nodes:
+
+<pre>
+# mkdir /etc/puppet/config
+# cat > /etc/puppet/config/site.csv <&lt;EOF
+# hadoop_head_node,hadoopmaster.example.com
+# hadoop_storage_dirs,/data/1,/data/2
+# bigtop_yumrepo_uri,http://mirror.example.com/path/to/mirror/
+# EOF
+# puppet -d --modulepath=bigtop-deploy/puppet/modules bigtop-deploy/puppet/manifests/site.pp
+</pre>

Added: incubator/bigtop/branches/RCs/bigtop-deploy/puppet/config/site.csv.example
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/puppet/config/site.csv.example?rev=1238787&view=auto
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-deploy/puppet/config/site.csv.example (added)
+++ incubator/bigtop/branches/RCs/bigtop-deploy/puppet/config/site.csv.example Tue Jan 31 20:22:33 2012
@@ -0,0 +1,3 @@
+hadoop_head_node,hadoopmaster.example.com
+hadoop_storage_dirs,/data/1,/data/2,/data/3,/data/4
+bigtop_yumrepo_uri,http://mirror.example.com/path/to/mirror/

Modified: incubator/bigtop/branches/RCs/bigtop-deploy/puppet/manifests/cluster.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/puppet/manifests/cluster.pp?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-deploy/puppet/manifests/cluster.pp (original)
+++ incubator/bigtop/branches/RCs/bigtop-deploy/puppet/manifests/cluster.pp Tue Jan 31 20:22:33 2012
@@ -14,33 +14,43 @@
 # limitations under the License.
 
 class hadoop_cluster_node {
-  $hadoop_namenode_host="$hadoop_head_node"
-  $hadoop_namenode_port="17020"
-  $hadoop_namenode_thrift_port="10090"
+  require bigtop_util  
+
+  $hadoop_namenode_host        = $hadoop_head_node
+  $hadoop_namenode_port        = extlookup("hadoop_namenode_port", "17020")
+  $hadoop_namenode_thrift_port = extlookup("hadoop_namenode_thrift_port", "10090")
+  $hadoop_dfs_namenode_plugins = extlookup("hadoop_dfs_namenode_plugins", "")
+  $hadoop_dfs_datanode_plugins = extlookup("hadoop_dfs_datanode_plugins", "")
   # $hadoop_dfs_namenode_plugins="org.apache.hadoop.thriftfs.NamenodePlugin"
   # $hadoop_dfs_datanode_plugins="org.apache.hadoop.thriftfs.DatanodePlugin"
 
-  $hadoop_jobtracker_host="$hadoop_head_node"
-  $hadoop_jobtracker_port="8021"
-  $hadoop_jobtracker_thrift_port="9290"
+  $hadoop_jobtracker_host            = $hadoop_head_node
+  $hadoop_jobtracker_port            = extlookup("hadoop_jobtracker_port", "8021")
+  $hadoop_jobtracker_thrift_port     = extlookup("hadoop_jobtracker_thrift_port", "9290")
+  $hadoop_mapred_jobtracker_plugins  = extlookup("hadoop_mapred_jobtracker_plugins", "")
+  $hadoop_mapred_tasktracker_plugins = extlookup("hadoop_mapred_tasktracker_plugins", "")
   # $hadoop_mapred_jobtracker_plugins="org.apache.hadoop.thriftfs.ThriftJobTrackerPlugin"
   # $hadoop_mapred_tasktracker_plugins="org.apache.hadoop.mapred.TaskTrackerCmonInst"
 
   $hadoop_core_proxyusers = { oozie => { groups => 'root,hadoop,jenkins,oozie,users', hosts => "${hadoop_head_node},localhost,127.0.0.1" } }
 
-  $hadoop_hbase_rootdir = "hdfs://$hadoop_namenode_host:$hadoop_namenode_port/hbase"
-  $hadoop_hbase_zookeeper_quorum = "$hadoop_head_node"
+  $hbase_relative_rootdir        = extlookup("hadoop_hbase_rootdir", "/hbase")
+  $hadoop_hbase_rootdir = "hdfs://$hadoop_namenode_host:$hadoop_namenode_port/$hbase_relative_rootdir"
+  $hadoop_hbase_zookeeper_quorum = $hadoop_head_node
 
   $hadoop_zookeeper_ensemble = ["$hadoop_head_node:2888:3888"]
 
-  $namenode_data_dirs = ["/mnt/namenode"]
-  $hdfs_data_dirs = ["/mnt/hdfs"]
-  $mapred_data_dirs = ["/mnt/scratch"]
+  # Set from facter if available
+  $roots              = extlookup("hadoop_storage_dirs",       split($hadoop_storage_dirs, ";"))
+  $namenode_data_dirs = extlookup("hadoop_namenode_data_dirs", append_each("/namenode", $roots))
+  $hdfs_data_dirs     = extlookup("hadoop_hdfs_data_dirs",     append_each("/hdfs",     $roots))
+  $mapred_data_dirs   = extlookup("hadoop_mapred_data_dirs",   append_each("/mapred",   $roots))
 
+  $hadoop_security_authentication = extlookup("hadoop_security", "simple")
   if ($hadoop_security_authentication == "kerberos") {
-    $kerberos_domain = "compute-1.internal"
-    $kerberos_realm = "EXAMPLE.COM"
-    $kerberos_kdc_server = "$hadoop_head_node"
+    $kerberos_domain     = extlookup("hadoop_kerberos_domain")
+    $kerberos_realm      = extlookup("hadoop_kerberos_realm")
+    $kerberos_kdc_server = extlookup("hadoop_kerberos_kdc_server")
 
     include kerberos::client
     kerberos::client::host_keytab { ["hdfs", "mapred", "hbase", "oozie"]:

Modified: incubator/bigtop/branches/RCs/bigtop-deploy/puppet/manifests/site.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/puppet/manifests/site.pp?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-deploy/puppet/manifests/site.pp (original)
+++ incubator/bigtop/branches/RCs/bigtop-deploy/puppet/manifests/site.pp Tue Jan 31 20:22:33 2012
@@ -13,10 +13,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require bigtop_util
+$puppet_confdir = get_setting("confdir")
+$default_yumrepo = "http://bigtop01.cloudera.org:8080/view/RCs/job/Bigtop-trunk-rc-zookeeper-3.4.0/label=centos5/lastSuccessfulBuild/artifact/output/"
+$extlookup_datadir="$puppet_confdir/config"
+$extlookup_precedence = ["site", "default"]
+
 stage {"pre": before => Stage["main"]}
 
 yumrepo { "Bigtop":
-    baseurl => "http://bigtop01.cloudera.org:8080/job/Bigtop-trunk-rc-hadoop-1.0.0-hbase-0.92.0/label=centos5/lastSuccessfulBuild/artifact/output/",
+    baseurl => extlookup("bigtop_yumrepo_uri", $default_yumrepo),
     descr => "Bigtop packages",
     enabled => 1,
     gpgcheck => 0,
@@ -32,6 +38,11 @@ package { "jdk":
 import "cluster.pp"
 
 node default {
+  # Fails if hadoop_head_node is unset
+  if (!$::hadoop_head_node) {
+    $hadoop_head_node = extlookup("hadoop_head_node") 
+  }
+
   if ($hadoop_head_node == $fqdn) {
     include hadoop_gateway_node
   } else {

Copied: incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/bigtop_util/lib/puppet/parser/functions/append_each.rb (from r1229288, incubator/bigtop/branches/RCs/bigtop-packages/src/common/hbase/do-component-build)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/bigtop_util/lib/puppet/parser/functions/append_each.rb?p2=incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/bigtop_util/lib/puppet/parser/functions/append_each.rb&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/common/hbase/do-component-build&r1=1229288&r2=1238787&rev=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/hbase/do-component-build (original)
+++ incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/bigtop_util/lib/puppet/parser/functions/append_each.rb Tue Jan 31 20:22:33 2012
@@ -1,20 +1,22 @@
-#!/bin/sh
 # Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
+# contributor license agreements. See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
 # The ASF licenses this file to You under the Apache License, Version 2.0
 # (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
+# the License. You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+     
+# Append a string to every element of an array
 
-set -ex
-
-mvn clean -DskipTests -Dhbase.version=${HBASE_VERSION} -Dhadoop.version=1.0.0 install assembly:assembly "$@"
-tar --strip-components=1 -xzf target/hbase*.tar.gz
+Puppet::Parser::Functions::newfunction(:append_each, :type => :rvalue) do |args|
+  suffix = (args[0].is_a? Array) ? args[0].join("") : args[0]
+  inputs = (args[1].is_a? Array) ? args[1] : [ args[1] ]
+  inputs.map { |item| item + suffix }
+end

Copied: incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/bigtop_util/lib/puppet/parser/functions/get_setting.rb (from r1229288, incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/do-component-build)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/bigtop_util/lib/puppet/parser/functions/get_setting.rb?p2=incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/bigtop_util/lib/puppet/parser/functions/get_setting.rb&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/do-component-build&r1=1229288&r2=1238787&rev=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/do-component-build (original)
+++ incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/bigtop_util/lib/puppet/parser/functions/get_setting.rb Tue Jan 31 20:22:33 2012
@@ -1,12 +1,11 @@
-#!/bin/sh
 # Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
+# contributor license agreements. See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
 # The ASF licenses this file to You under the Apache License, Version 2.0
 # (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
+# the License. You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -ex
-
-ant -Dversion=${FLUME_VERSION} tar "$@" 
+# Retrieve a value from Puppet.settings (systemwide puppet configuration)
+Puppet::Parser::Functions::newfunction(:get_setting, :type => :rvalue) do |args|
+  ret = Puppet[args[0].to_sym]  
+  ret.nil? ? :undef : ret
+end

Copied: incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/bigtop_util/manifests/init.pp (from r1229288, incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/do-component-build)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/bigtop_util/manifests/init.pp?p2=incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/bigtop_util/manifests/init.pp&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/do-component-build&r1=1229288&r2=1238787&rev=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/do-component-build (original)
+++ incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/bigtop_util/manifests/init.pp Tue Jan 31 20:22:33 2012
@@ -1,12 +1,11 @@
-#!/bin/sh
 # Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
+# contributor license agreements. See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
 # The ASF licenses this file to You under the Apache License, Version 2.0
 # (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
+# the License. You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,6 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -ex
-
-ant -Dversion=${FLUME_VERSION} tar "$@" 
+class bigtop_util {
+}

Added: incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/lib/facter/hadoop_storage_dirs.rb
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/lib/facter/hadoop_storage_dirs.rb?rev=1238787&view=auto
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/lib/facter/hadoop_storage_dirs.rb (added)
+++ incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/lib/facter/hadoop_storage_dirs.rb Tue Jan 31 20:22:33 2012
@@ -0,0 +1,14 @@
+Facter.add("hadoop_storage_dirs") do
+  setcode do
+    [ Facter.value("hadoop_storage_dir_pattern"),
+      "/data/[0-9]*",
+      "/mnt" ].reject(&:nil?).each do |pattern|
+
+      storage_dirs = Dir.glob(pattern) \
+        .select { |path| File.directory? path } \
+        .join(";")
+
+      break storage_dirs if storage_dirs.size > 0
+    end
+  end
+end

Modified: incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp (original)
+++ incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp Tue Jan 31 20:22:33 2012
@@ -136,7 +136,7 @@ class hadoop {
     exec { "namenode format":
       user => "hdfs",
       command => "/bin/bash -c 'yes Y | hadoop namenode -format >> /tmp/nn.format.log 2>&1'",
-      creates => inline_template("<%= hadoop_storage_locations.split(';')[0] %>/namenode/image"),
+      creates => "${namenode_data_dirs[0]}/image"),
       require => [ Package["hadoop-namenode"], File[$dirs] ],
     } 
     

Modified: incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/templates/hdfs-site.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/templates/hdfs-site.xml?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/templates/hdfs-site.xml (original)
+++ incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/templates/hdfs-site.xml Tue Jan 31 20:22:33 2012
@@ -108,12 +108,12 @@
  
   <property>
     <name>dfs.data.dir</name>
-    <value><% hadoop_storage_locations.split(";").each do |storage_location| %><%= storage_location%>/hdfs,<% end %></value>
+    <value><%= hdfs_data_dirs.join(",") %></value>
   </property>
  
   <property>
     <name>dfs.name.dir</name>
-    <value><% hadoop_storage_locations.split(";").each do |storage_location| %><%= storage_location%>/namenode,<% end %></value>
+    <value><%= namenode_data_dirs.join(",") %></value>
   </property>
 
   <!-- Enable Hue plugins -->

Modified: incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml (original)
+++ incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml Tue Jan 31 20:22:33 2012
@@ -101,7 +101,7 @@
 
   <property>
     <name>mapred.local.dir</name>
-    <value><% hadoop_storage_locations.split(";").each do |storage_location| %><%= storage_location%>/scratch,<% end %></value>
+    <value><%= mapred_data_dirs.join(",") %></value>
     <final>true</final>
   </property>
 

Modified: incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/templates/taskcontroller.cfg
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/templates/taskcontroller.cfg?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/templates/taskcontroller.cfg (original)
+++ incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/templates/taskcontroller.cfg Tue Jan 31 20:22:33 2012
@@ -1,4 +1,4 @@
-mapred.local.dir=<% hadoop_storage_locations.split(";").each do |storage_location| %><%= storage_location%>/scratch,<% end %>
+mapred.local.dir=<%= mapred_data_dirs.join(",") %>
 hadoop.log.dir=/var/log/hadoop/
 mapreduce.tasktracker.group=mapred
 min.user.id=0

Modified: incubator/bigtop/branches/RCs/bigtop-deploy/vm/boxgrinder/bigtop_hadoop.appl
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/vm/boxgrinder/bigtop_hadoop.appl?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-deploy/vm/boxgrinder/bigtop_hadoop.appl (original)
+++ incubator/bigtop/branches/RCs/bigtop-deploy/vm/boxgrinder/bigtop_hadoop.appl Tue Jan 31 20:22:33 2012
@@ -27,8 +27,8 @@ hardware:
       size: 2
       type: ext3
 repos:
-  - name: "Apache Bigtop - incubating"
-    baseurl: "http://www.apache.org/dist/incubator/bigtop/stable/repos/centos6/"
+  - name: "Bigtop"
+    baseurl: "http://bigtop01.cloudera.org:8080/view/Bigtop-trunk/job/Bigtop-trunk-Repository/label=centos6/lastSuccessfulBuild/artifact/repo/"
 packages:
   - @core
   - shadow-utils

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome Tue Jan 31 20:22:33 2012
@@ -15,10 +15,9 @@
 # limitations under the License.
 
 
-# Uncomment and set the following variable in order for the 
-# guesswork step to be skipped
-#
-# JAVA_HOME=/usr/java/latest
+# Override JAVA_HOME in the file below if you want to disable
+# automatic JAVA_HOME detection
+[ -r /etc/default/bigtop-utils ] && . /etc/default/bigtop-utils
 
 # attempt to find java
 if [ -z "$JAVA_HOME" ]; then

Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/common/bigtop-utils/bigtop-utils.default (from r1229288, incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/do-component-build)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/common/bigtop-utils/bigtop-utils.default?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/common/bigtop-utils/bigtop-utils.default&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/do-component-build&r1=1229288&r2=1238787&rev=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/do-component-build (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/common/bigtop-utils/bigtop-utils.default Tue Jan 31 20:22:33 2012
@@ -1,4 +1,3 @@
-#!/bin/sh
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -14,6 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -ex
-
-ant -Dversion=${FLUME_VERSION} tar "$@" 
+# Override JAVA_HOME detection for all bigtop packages
+# export JAVA_HOME

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/do-component-build
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/do-component-build?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/do-component-build (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/do-component-build Tue Jan 31 20:22:33 2012
@@ -16,4 +16,4 @@
 
 set -ex
 
-ant -Dversion=${FLUME_VERSION} tar "$@" 
+mvn clean install -DskipTests "$@" 

Propchange: incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/do-component-build
------------------------------------------------------------------------------
    svn:executable = *

Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/flume-node.init (from r1229288, incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/flume/SOURCES/init.d.suse)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/flume-node.init?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/flume-node.init&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/flume/SOURCES/init.d.suse&r1=1229288&r2=1238787&rev=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/flume/SOURCES/init.d.suse (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/flume-node.init Tue Jan 31 20:22:33 2012
@@ -15,20 +15,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Starts a Flume @FLUME_DAEMON@
+# Starts a Flume node
 #
 # chkconfig: 345 90 10
-# description: Flume @FLUME_DAEMON@
+# description: Flume node
 #
 ### BEGIN INIT INFO
-# Provides:          flume-@FLUME_DAEMON@
+# Provides:          flume-node
 # Required-Start:    $remote_fs
 # Should-Start:
 # Required-Stop:     $remote_fs
 # Should-Stop:
 # Default-Start:     3 4 5
 # Default-Stop:      0 1 2 6
-# Short-Description: Flume @FLUME_DAEMON@
+# Short-Description: Flume node
 ### END INIT INFO
 
 . /lib/lsb/init-functions
@@ -48,34 +48,55 @@ STATUS_NOT_RUNNING=3
 ERROR_PROGRAM_NOT_INSTALLED=5
 
 FLUME_LOG_DIR=/var/log/flume
-FLUME_HOME=/usr/lib/flume
-EXEC_PATH=${FLUME_HOME}/bin/flume-daemon.sh
-DOTIME=3
+FLUME_CONF_DIR=/etc/flume/conf
 FLUME_RUN=/var/run/flume
-FLUME_PID=/var/run/flume/flume-flume-@FLUME_DAEMON@.pid
-LOCKFILE="/var/lock/subsys/flume-@FLUME_DAEMON@"
-desc="Flume @FLUME_DAEMON@ daemon"
+FLUME_HOME=/usr/lib/flume
+
+LOCKFILE="/var/lock/subsys/flume-node"
+desc="Flume node daemon"
+
+FLUME_CONF_FILE=${FLUME_CONF_FILE:-${FLUME_CONF_DIR}/flume.conf}
+EXEC_PATH=/usr/bin/flume-ng
+FLUME_PID_FILE=${FLUME_RUN}/flume-node.pid
+
 install -d -m 0755 -o flume -g flume ${FLUME_RUN} 
 USER=flume
 
+HOSTNAME=`hostname`
+FLUME_NODE_NAME=${FLUME_NODE_NAME:-$HOSTNAME}
 
 start() {
   [ -x $exec ] || exit $ERROR_PROGRAM_NOT_INSTALLED
-  log_success_msg "Starting $desc (flume-@FLUME_DAEMON@): "
-  start_daemon -u $USER $EXEC_PATH start @FLUME_DAEMON@
+  log_success_msg "Starting $desc (flume-node): "
+  export FLUME_PID_FILE
+  /bin/su -s /bin/bash -c "${EXEC_PATH} node --conf $FLUME_CONF_DIR --conf-file $FLUME_CONF_FILE --name $FLUME_NODE_NAME &>>${FLUME_LOG_DIR}/flume-node.log &" $USER
   RETVAL=$?
-  echo
   [ $RETVAL -eq 0 ] && touch $LOCKFILE
   return $RETVAL
 }
 
 stop() {
-  log_success_msg "Stopping $desc (flume-@FLUME_DAEMON@): "
-  start_daemon -u $USER $EXEC_PATH stop @FLUME_DAEMON@
-  RETVAL=$?
-  sleep 5
-  echo
-  [ $RETVAL -eq 0 ] && rm -f $LOCKFILE $FLUME_PID
+  if [ ! -e $FLUME_PID_FILE ]; then
+    log_failure_msg "Flume node is not running"
+    exit $STATUS_NOT_RUNNING
+  fi
+
+  log_success_msg "Stopping $desc (flume-node): "
+
+  # FLUME-919 will put an end to such extreme violence
+  FLUME_PID=`cat $FLUME_PID_FILE`
+  if [ -n $FLUME_PID ]; then
+    FLUME_PID_GROUP=$(ps -o pgrp -p ${FLUME_PID} h)
+
+    if [ -n $FLUME_PID_GROUP ]; then
+      kill -TERM -${FLUME_PID_GROUP} &>/dev/null
+      sleep 5
+      kill -KILL -${FLUME_PID_GROUP} &>/dev/null
+
+      rm -f $LOCKFILE $FLUME_PID_FILE
+    fi
+  fi
+  return 0
 }
 
 restart() {
@@ -84,31 +105,31 @@ restart() {
 }
 
 checkstatus(){
-  pidofproc -p $FLUME_PID java > /dev/null
+  pidofproc -p $FLUME_PID_FILE java > /dev/null
   status=$?
 
   case "$status" in
     $STATUS_RUNNING)
-      log_success_msg "@FLUME_DAEMON@ is running"
+      log_success_msg "Flume node is running"
       ;;
     $STATUS_DEAD)
-      log_failure_msg "@FLUME_DAEMON@ is dead and pid file exists"
+      log_failure_msg "Flume node is dead and pid file exists"
       ;;
     $STATUS_DEAD_AND_LOCK)
-      log_failure_msg "@FLUME_DAEMON@ is dead and lock file exists"
+      log_failure_msg "Flume node is dead and lock file exists"
       ;;
     $STATUS_NOT_RUNNING)
-      log_failure_msg "@FLUME_DAEMON@ is not running"
+      log_failure_msg "Flume node is not running"
       ;;
     *)
-      log_failure_msg "@FLUME_DAEMON@ status is unknown"
+      log_failure_msg "Flume node status is unknown"
       ;;
   esac
   return $status
 }
 
 condrestart(){
-  [ -e /var/lock/subsys/hadoop-@FLUME_DAEMON@ ] && restart || :
+  [ -e /var/lock/subsys/flume-node ] && restart || :
 }
 
 case "$1" in

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/install_flume.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/install_flume.sh?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/install_flume.sh (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/install_flume.sh Tue Jan 31 20:22:33 2012
@@ -25,7 +25,7 @@ usage: $0 <options>
 
   Optional options:
      --doc-dir=DIR               path to install docs into [/usr/share/doc/flume]
-     --lib-dir=DIR               path to install flume home [/usr/lib/flume]
+     --flume-dir=DIR               path to install flume home [/usr/lib/flume]
      --installed-lib-dir=DIR     path where lib-dir will end up on target system
      --bin-dir=DIR               path to install bins [/usr/bin]
      --examples-dir=DIR          path to install examples [doc-dir/examples]
@@ -39,7 +39,7 @@ OPTS=$(getopt \
   -o '' \
   -l 'prefix:' \
   -l 'doc-dir:' \
-  -l 'lib-dir:' \
+  -l 'flume-dir:' \
   -l 'installed-lib-dir:' \
   -l 'bin-dir:' \
   -l 'examples-dir:' \
@@ -62,8 +62,8 @@ while true ; do
         --doc-dir)
         DOC_DIR=$2 ; shift 2
         ;;
-        --lib-dir)
-        LIB_DIR=$2 ; shift 2
+        --flume-dir)
+        FLUME_DIR=$2 ; shift 2
         ;;
         --installed-lib-dir)
         INSTALLED_LIB_DIR=$2 ; shift 2
@@ -94,32 +94,27 @@ done
 
 MAN_DIR=${MAN_DIR:-/usr/share/man/man1}
 DOC_DIR=${DOC_DIR:-/usr/share/doc/flume}
-LIB_DIR=${LIB_DIR:-/usr/lib/flume}
+FLUME_DIR=${FLUME_DIR:-/usr/lib/flume}
 BIN_DIR=${BIN_DIR:-/usr/lib/flume/bin}
 CONF_DIR=/etc/flume/
 CONF_DIST_DIR=/etc/flume/conf.dist/
 ETC_DIR=${ETC_DIR:-/etc/flume}
 
+install -d -m 0755 ${PREFIX}/${FLUME_DIR}
 
-install -d -m 0755 ${PREFIX}/${LIB_DIR}
+(cd ${PREFIX}/${FLUME_DIR} &&
+  tar --strip-components=1 -xvzf ${BUILD_DIR}/flume-ng-dist/target/flume-ng-dist-*-dist.tar.gz)
 
-install -d -m 0755 ${PREFIX}/${LIB_DIR}/lib
-for i in `find lib/*.jar build/lib/*.jar -type f |grep -v zookeeper`
-	do echo "Copying $i"
-	cp $i ${PREFIX}/${LIB_DIR}/lib #don't copy directories by default
+# Take out things we've installed elsewhere
+for x in flume-ng-* conf pom.xml CHANGELOG DEVNOTES DISCLAIMER LICENSE NOTICE README RELEASE-NOTES; do
+  rm -rf ${PREFIX}/$FLUME_DIR/$x 
 done
 
-cp flume*.jar ${PREFIX}/${LIB_DIR}/lib
 
-cp -a webapps ${PREFIX}/${LIB_DIR}
-
-install -d -m 0755 $PREFIX/$BIN_DIR
-cp bin/flume bin/flume-daemon.sh bin/flume-env.sh.template $PREFIX/${BIN_DIR}
-
-wrapper=$PREFIX/usr/bin/flume
+wrapper=$PREFIX/usr/bin/flume-ng
 mkdir -p `dirname $wrapper`
 cat > $wrapper <<EOF
-#!/bin/sh
+#!/bin/bash
 
 # Autodetect JAVA_HOME if not defined
 if [ -e /usr/libexec/bigtop-detect-javahome ]; then
@@ -128,22 +123,24 @@ elif [ -e /usr/lib/bigtop-utils/bigtop-d
   . /usr/lib/bigtop-utils/bigtop-detect-javahome
 fi
 
-exec /usr/lib/flume/bin/flume "\$@"
+if [ -n "\$FLUME_PID_FILE" ]; then
+  echo \$$ > \$FLUME_PID_FILE
+fi
+
+# See FLUME-920
+bash exec /usr/lib/flume/bin/flume-ng "\$@"
 EOF
 chmod 755 $wrapper
 
 
 install -d -m 0755 $PREFIX/$ETC_DIR/conf.empty
 (cd ${BUILD_DIR}/conf && tar cf - .) | (cd $PREFIX/$ETC_DIR/conf.empty && tar xf -)
+touch $PREFIX/$ETC_DIR/conf.empty/flume.conf
 
-unlink $PREFIX/$LIB_DIR/conf || /bin/true
-ln -s /etc/flume/conf $PREFIX/$LIB_DIR/conf
+unlink $PREFIX/$FLUME_DIR/conf || /bin/true
+ln -s /etc/flume/conf $PREFIX/$FLUME_DIR/conf
 
 # Docs
 install -d -m 0755 $PREFIX/${DOC_DIR}
-cp -r docs/* $PREFIX/${DOC_DIR}
-
-
-# man pages
-install -d -m 0755 $PREFIX/$MAN_DIR
+cp -r CHANGELOG DEVNOTES DISCLAIMER LICENSE NOTICE README RELEASE-NOTES $PREFIX/${DOC_DIR}
 

Propchange: incubator/bigtop/branches/RCs/bigtop-packages/src/common/flume/install_flume.sh
------------------------------------------------------------------------------
    svn:executable = *

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/do-component-build
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/do-component-build?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/do-component-build (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/do-component-build Tue Jan 31 20:22:33 2012
@@ -17,7 +17,7 @@
 set -ex
 
 # FIXME: BIGTOP-137
-chmod 777 src/c++/task-controller/configure
+chmod 777 src/c++/task-controller/configure || :
 
 
 # This is a poor man version comparison of autoconf.

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/install_hadoop.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/install_hadoop.sh?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/install_hadoop.sh (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/common/hadoop/install_hadoop.sh Tue Jan 31 20:22:33 2012
@@ -163,7 +163,7 @@ cp -a $BUILD_SRC_DIR/examples/* $EXAMPLE
 
 # Install docs
 mkdir -p $DOC_DIR
-cp -r ./docs/* $DOC_DIR
+cp -r $BUILD_DIR/docs/* $DOC_DIR
 
 # Install source
 mkdir -p ${SRC_DIR}
@@ -281,13 +281,13 @@ EOF
 
   # Pipes
   mkdir -p $PREFIX/$SYSTEM_LIB_DIR $PREFIX/usr/include
-  cp ./c++/${NATIVE_BUILD_STRING}/lib/libhadooppipes.a \
-      ./c++/${NATIVE_BUILD_STRING}/lib/libhadooputils.a \
+  cp ${BUILD_DIR}/c++/${NATIVE_BUILD_STRING}/lib/libhadooppipes.a \
+      ${BUILD_DIR}/c++/${NATIVE_BUILD_STRING}/lib/libhadooputils.a \
       $PREFIX/$SYSTEM_LIB_DIR
-  cp -r ./c++/${NATIVE_BUILD_STRING}/include/hadoop $PREFIX/usr/include/
+  cp -r ${BUILD_DIR}/c++/${NATIVE_BUILD_STRING}/include/hadoop $PREFIX/usr/include/
 
   # libhdfs
-  cp ./build/c++/${NATIVE_BUILD_STRING}/lib/libhdfs.so.0.0.0 $PREFIX/$SYSTEM_LIB_DIR
+  cp ${BUILD_DIR}/c++/${NATIVE_BUILD_STRING}/lib/libhdfs.so.0.0.0 $PREFIX/$SYSTEM_LIB_DIR
   ln -sf libhdfs.so.0.0.0 $PREFIX/$SYSTEM_LIB_DIR/libhdfs.so.0
 
   # libhdfs-devel - hadoop doesn't realy install these things in nice places :(

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/common/hbase/do-component-build
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/common/hbase/do-component-build?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/hbase/do-component-build (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/common/hbase/do-component-build Tue Jan 31 20:22:33 2012
@@ -16,5 +16,5 @@
 
 set -ex
 
-mvn clean -DskipTests -Dhbase.version=${HBASE_VERSION} -Dhadoop.version=1.0.0 install assembly:assembly "$@"
+mvn clean -DskipTests -Dhbase.version=${HBASE_VERSION} -Dhadoop.version=0.20.205.0 install assembly:assembly "$@"
 tar --strip-components=1 -xzf target/hbase*.tar.gz

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper-server.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper-server.sh?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper-server.sh (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper-server.sh Tue Jan 31 20:22:33 2012
@@ -43,7 +43,7 @@ DAEMON_SCRIPT="/usr/bin/zookeeper-server
 
 NAME=zookeeper-server
 DESC="ZooKeeper daemon"
-PID_FILE=/var/run/zookeeper/zookeeper_server.pid
+PID_FILE=/var/run/zookeeper/zookeeper-server.pid
 install -d -m 0755 -o zookeeper -g zookeeper /var/run/zookeeper/
 
 DODTIME=3

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse Tue Jan 31 20:22:33 2012
@@ -51,7 +51,7 @@ RETVAL=0
 EXEC_PATH="/usr/bin/zookeeper-server"
 NAME=zookeeper-server
 DESC="$NAME"
-PIDFILE=/var/run/zookeeper/zookeeper_server.pid
+PIDFILE=/var/run/zookeeper/zookeeper-server.pid
 LOCKFILE="/var/lock/subsys/zookeeper"
 USER=zookeeper
 

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/bigtop-utils/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/bigtop-utils/rules?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/bigtop-utils/rules (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/bigtop-utils/rules Tue Jan 31 20:22:33 2012
@@ -51,6 +51,8 @@ install-indep:	
 	# Copy repo file
 	install -d -p -m 755 debian/bigtop-utils/usr/lib/bigtop-utils/
 	install -p -m 755 debian/bigtop-detect-javahome debian/bigtop-utils/usr/lib/bigtop-utils/
+	install -d -p -m 755 debian/bigtop-utils/etc/default
+	install -p -m 644 debian/bigtop-utils.default debian/bigtop-utils/etc/default/bigtop-utils
 	dh_install
 
 

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/control?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/control (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/control Tue Jan 31 20:22:33 2012
@@ -17,13 +17,13 @@ Source: flume
 Section: misc
 Priority: extra
 Maintainer: Bigtop <bigtop-dev@incubator.apache.org>
-Build-Depends: debhelper (>= 6), ant, ant-optional, git-core
+Build-Depends: debhelper (>= 6), ant, ant-optional
 Standards-Version: 3.8.0
 Homepage: http://incubator.apache.org/projects/flume.html
 
 Package: flume
 Architecture: all
-Depends: zookeeper (>= 3.3.1), adduser, hadoop, bigtop-utils
+Depends: adduser, hadoop, bigtop-utils
 Description: reliable, scalable, and manageable distributed data collection application
  Flume is a reliable, scalable, and manageable distributed data collection
  application for collecting data such as logs and delivering it to data stores
@@ -34,13 +34,6 @@ Description: reliable, scalable, and man
  managed and allows for intelligent dynamic management.  It uses a simple
  extensible data model that allows for online analytic applications.
 
-Package: flume-master
-Architecture: all
-Depends: flume (= ${source:Version})
-Description: central administration point for the flume data collection system
- The Flume master daemon is the central administration and data path control
- point for flume nodes.
-
 Package: flume-node
 Architecture: all
 Depends: flume (= ${source:Version})

Copied: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/flume-node.postinst (from r1229288, incubator/bigtop/branches/RCs/bigtop-packages/src/common/hbase/do-component-build)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/flume-node.postinst?p2=incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/flume-node.postinst&p1=incubator/bigtop/branches/RCs/bigtop-packages/src/common/hbase/do-component-build&r1=1229288&r2=1238787&rev=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/common/hbase/do-component-build (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/flume-node.postinst Tue Jan 31 20:22:33 2012
@@ -14,7 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -ex
+set -e
+if [ -x "/etc/init.d/flume-node" ]; then
+  update-rc.d flume-node defaults >/dev/null
+  if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+    invoke-rc.d flume-node start || :
+  else
+    /etc/init.d/flume-node start || :
+  fi
+fi
 
-mvn clean -DskipTests -Dhbase.version=${HBASE_VERSION} -Dhadoop.version=1.0.0 install assembly:assembly "$@"
-tar --strip-components=1 -xzf target/hbase*.tar.gz

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/flume.docs
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/flume.docs?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/flume.docs (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/flume.docs Tue Jan 31 20:22:33 2012
@@ -1,5 +1,7 @@
+CHANGELOG
 DEVNOTES
+DISCLAIMER
+LICENSE
 NOTICE
-RELEASENOTES
 README
-LICENSE
+RELEASE-NOTES

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/rules?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/rules (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/flume/rules Tue Jan 31 20:22:33 2012
@@ -39,23 +39,22 @@ clean:	
 
 build-indep: build-indep-stamp
 build-indep-stamp: patch-stamp
-	# Temporarily disabled - we'll just use the build from the tarball.
+	# No easy way to disable the default RAT run which fails the build because of some fails in the debian/ directory
+	rm -rf bigtop-empty
+	mkdir -p bigtop-empty
+	# I could not find a way to add debian/ to RAT exclude list through cmd line
+	# or to unbind rat:check goal
+	# So I am redirecting its attention with a decoy
 	env FLUME_VERSION=$(build_version) \
-		sh debian/do-component-build -Divy.home=`pwd`/debian/.ivy
-	mkdir -p debian/tmp
-	tar cf - --exclude=debian/\* . | (cd debian/tmp && tar xf -)
+		sh debian/do-component-build -Drat.basedir=${PWD}/bigtop-empty -Dmaven.repo.local=${HOME}/.m2/repository
 	touch $@
 
-master node: debian/service-init.d.tpl
-	sed -e 's#@FLUME_DAEMON@#$@#g' $< > debian/flume-$@.init
-
 install: install-indep
-install-indep:	master node
+install-indep:
 	dh_testdir
 	dh_testroot
-#	ant package
 	sh -x debian/install_flume.sh \
-	  --build-dir=. \
+	  --build-dir=${PWD} \
 	  --prefix=debian/flume 
 	# Remove hadoop dependency and instead symlink in the hadoop jar
 	rm debian/flume/usr/lib/flume/lib/hadoop-core-*

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hadoop/hadoop-conf-pseudo.postinst
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hadoop/hadoop-conf-pseudo.postinst?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hadoop/hadoop-conf-pseudo.postinst (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hadoop/hadoop-conf-pseudo.postinst Tue Jan 31 20:22:33 2012
@@ -40,13 +40,6 @@ case "$1" in
         if [ ! -e /etc/hadoop/conf ]; then 
           ln -s /etc/hadoop/conf.pseudo /etc/hadoop/conf 
         fi
-        nn_dfs_dir="/var/lib/hadoop/cache/hadoop/dfs"
-        if [ -z "$(ls -A $nn_dfs_dir/name 2>/dev/null)" ]; then
-            mkdir -p $nn_dfs_dir
-            chown hdfs:hadoop $nn_dfs_dir
-            su -s /bin/sh hdfs -c \
-             'hadoop --config /etc/hadoop/conf.pseudo namenode -format' 2>/dev/null 1>/dev/null || :
-        fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/hive.postinst
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/hive.postinst?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/hive.postinst (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/hive/hive.postinst Tue Jan 31 20:22:33 2012
@@ -22,7 +22,7 @@ set -e
 case "$1" in
     configure)
         chown hive:hive -R /var/run/hive /var/log/hive
-
+	chown hive:hive -R /var/lib/hive
         # Install config alternatives
         update-alternatives  --install /etc/hive/conf hive-conf /etc/hive/conf.dist 30
 

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/whirr/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/whirr/rules?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/whirr/rules (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/whirr/rules Tue Jan 31 20:22:33 2012
@@ -37,7 +37,13 @@ clean:	
 
 build-indep: build-indep-stamp
 build-indep-stamp: patch-stamp
-	bash debian/do-component-build -Dmaven.repo.local=${HOME}/.m2/repository
+	# No easy way to disable the default RAT run which fails the build because of some fails in the debian/ directory
+	rm -rf bigtop-empty
+	mkdir -p bigtop-empty
+	# Bruno could not find a way to add debian/ to RAT exclude list through cmd line
+	# or to unbind rat:check goal
+	# So he was redirecting its attention with a decoy
+	bash debian/do-component-build -Drat.basedir=${PWD}/bigtop-empty -Dmaven.repo.local=${HOME}/.m2/repository
 	mkdir -p debian/tmp
 	# NOTE: FIXME me right away
 	cp -r debian/whirr.1 .

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper-server.init
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper-server.init?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper-server.init (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/deb/zookeeper/zookeeper-server.init Tue Jan 31 20:22:33 2012
@@ -36,7 +36,7 @@ DAEMON_SCRIPT="/usr/bin/zookeeper-server
 
 NAME=zookeeper-server
 DESC="ZooKeeper daemon"
-PID_FILE=/var/run/zookeeper/zookeeper_server.pid
+PID_FILE=/var/run/zookeeper/zookeeper-server.pid
 install -d -m 0755 -o zookeeper -g zookeeper /var/run/zookeeper/
 
 

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec Tue Jan 31 20:22:33 2012
@@ -23,6 +23,7 @@ License:	APL2
 URL:		http://incubator.apache.org/bigtop/
 Source0:	bigtop-detect-javahome
 Source1:	LICENSE
+Source2:    bigtop-utils.default
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -36,13 +37,16 @@ This includes a collection of useful too
 %setup -q -T -c
 install -p -m 644 %{SOURCE0} .
 install -p -m 644 %{SOURCE1} .
+install -p -m 644 %{SOURCE2} .
 
 %build
 
 
 %install
 install -d -p -m 755 $RPM_BUILD_ROOT%{_libexecdir}/
+install -d -p -m 755 $RPM_BUILD_ROOT/etc/default
 install -p -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{_libexecdir}/
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/default/bigtop-utils
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -51,6 +55,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc LICENSE
+%config(noreplace) /etc/default/bigtop-utils
 
 %{_libexecdir}/bigtop-detect-javahome
 

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/flume/SPECS/flume.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/flume/SPECS/flume.spec?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/flume/SPECS/flume.spec (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/flume/SPECS/flume.spec Tue Jan 31 20:22:33 2012
@@ -17,7 +17,6 @@
 %define man_flume %{_mandir}
 %define lib_flume /usr/lib/flume
 %define log_flume /var/log/flume
-%define flume_services master node
 
 %if  %{?suse_version:1}0
 
@@ -62,9 +61,8 @@ License: APL2
 Source0: flume-%{flume_base_version}.tar.gz
 Source1: do-component-build
 Source2: install_%{name}.sh
-Source3: init.d
-Source4: init.d.suse
-Requires: coreutils, /usr/sbin/useradd, zookeeper >= 3.3.1, hadoop >= 0.20.2
+Source3: %{name}-node.init
+Requires: coreutils, /usr/sbin/useradd, hadoop
 Requires: bigtop-utils
 BuildRequires: ant xml-commons xml-commons-apis
 
@@ -77,39 +75,12 @@ Requires: sh-utils
 %description 
 Flume is a reliable, scalable, and manageable distributed data collection application for collecting data such as logs and delivering it to data stores such as Hadoop's HDFS.  It can efficiently collect, aggregate, and move large amounts of log data.  It has a simple, but flexible, architecture based on streaming data flows.  It is robust and fault tolerant with tunable reliability mechanisms and many failover and recovery mechanisms.  The system is centrally managed and allows for intelligent dynamic management. It uses a simple extensible data model that allows for online analytic applications.
 
-%package master
-Summary: The flume master daemon is the central administration and data path control point for flume nodes.
-Group: Development/Libraries
-BuildArch: noarch
-Requires: %{name} = %{version}-%{release}, /sbin/service
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-
-%if  %{?suse_version:1}0
-# Required for init scripts
-Requires: insserv
-%endif
-
-%if  0%{?mgaversion}
-# Required for init scripts
-Requires: initscripts
-%endif
-
-# CentOS 5 does not have any dist macro
-# So I will suppose anything that is not Mageia or a SUSE will be a RHEL/CentOS/Fedora
-%if %{!?suse_version:1}0 && %{!?mgaversion:1}0
-# Required for init scripts
-Requires: redhat-lsb
-%endif
-
-%description master
-Flume is a reliable, scalable, and manageable distributed data collection application for collecting data such as logs and delivering it to data stores such as Hadoop's HDFS.  It can efficiently collect, aggregate, and move large amounts of log data.  It has a simple, but flexible, architecture based on streaming data flows.  It is robust and fault tolerant with tunable reliability mechanisms and many failover and recovery mechanisms.  The system is centrally managed and allows for intelligent dynamic management. It uses a simple extensible data model that allows for online analytic applications.
-
 %package node
 Summary: The flume node daemon is a core element of flume's data path and is responsible for generating, processing, and delivering data.
 Group: Development/Libraries
 BuildArch: noarch
 Requires: %{name} = %{version}-%{release}, /sbin/service
+Requires(pre): %{name} = %{version}-%{release}
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 
@@ -142,25 +113,17 @@ env FLUME_VERSION=%{version} sh %{SOURCE
 %install
 %__rm -rf $RPM_BUILD_ROOT
 sh %{SOURCE2} \
-          --build-dir=. \
+          --build-dir=$PWD \
           --prefix=$RPM_BUILD_ROOT \
 	  --doc-dir=%{doc_flume}
 %__install -d -m 0755 $RPM_BUILD_ROOT/%{initd_dir}/
 
 
-%if  %{?suse_version:1}0
-orig_init_file=$RPM_SOURCE_DIR/init.d.suse
-%else
-orig_init_file=$RPM_SOURCE_DIR/init.d
-%endif
+# Install init script
+init_file=$RPM_BUILD_ROOT/%{initd_dir}/%{name}-node
+%__cp %{SOURCE3} $init_file
+chmod 755 $init_file
 
-for service in %{flume_services}
-do
-        init_file=$RPM_BUILD_ROOT/%{initd_dir}/%{name}-${service}
-        %__cp $orig_init_file $init_file
-        %__sed -i -e "s|@FLUME_DAEMON@|${service}|" $init_file
-        chmod 755 $init_file
-done
 
 %__install -d -m 0755 $RPM_BUILD_ROOT/usr/bin
 
@@ -183,6 +146,20 @@ if [ "$1" = 0 ]; then
         %{alternatives_cmd} --remove %{name}-conf %{etc_flume}.empty || :
 fi
 
+%post node
+chkconfig --add %{name}-node
+
+%preun node
+if [ $1 = 0 ] ; then
+        service %{name}-node stop > /dev/null 2>&1
+        chkconfig --del %{name}-node
+fi
+%postun node
+if [ $1 -ge 1 ]; then
+        service %{name}-node condrestart >/dev/null 2>&1
+fi
+
+
 %files 
 %defattr(-,flume,flume)
 %config(noreplace) %{etc_flume}.empty
@@ -191,22 +168,7 @@ fi
 %attr(0755,root,root) %{bin_flume}
 %attr(0755,root,root) %{lib_flume}
 
-%define service_macro() \
-%files %1 \
-%attr(0755,root,root)/%{initd_dir}/%{name}-%1 \
-%dir %{lib_flume}/bin \
-%dir %{lib_flume} \
-%post %1 \
-chkconfig --add %{name}-%1 \
-\
-%preun %1 \
-if [ $1 = 0 ] ; then \
-        service %{name}-%1 stop > /dev/null 2>&1 \
-        chkconfig --del %{name}-%1 \
-fi \
-%postun %1 \
-if [ $1 -ge 1 ]; then \
-        service %{name}-%1 condrestart >/dev/null 2>&1 \
-fi
-%service_macro node
-%service_macro master
+%files node
+%attr(0755,root,root)/%{initd_dir}/%{name}-node
+%dir %{lib_flume}/bin
+%dir %{lib_flume}

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec Tue Jan 31 20:22:33 2012
@@ -167,6 +167,7 @@ located.
 Summary: The Hadoop namenode manages the block locations of HDFS files
 Group: System/Daemons
 Requires: %{name} = %{version}-%{release}
+Requires(pre): %{name} = %{version}-%{release}
 
 %description namenode
 The Hadoop Distributed Filesystem (HDFS) requires one unique server, the
@@ -177,6 +178,7 @@ namenode, which manages the block locati
 Summary: Hadoop Secondary namenode
 Group: System/Daemons
 Requires: %{name} = %{version}-%{release}
+Requires(pre): %{name} = %{version}-%{release}
 
 %description secondarynamenode
 The Secondary Name Node periodically compacts the Name Node EditLog
@@ -188,6 +190,7 @@ do not incur unnecessary downtime.
 Summary: Hadoop Job Tracker
 Group: System/Daemons
 Requires: %{name} = %{version}-%{release}
+Requires(pre): %{name} = %{version}-%{release}
 
 %description jobtracker
 The jobtracker is a central service which is responsible for managing
@@ -200,6 +203,7 @@ with an available work slot.
 Summary: Hadoop Data Node
 Group: System/Daemons
 Requires: %{name} = %{version}-%{release}
+Requires(pre): %{name} = %{version}-%{release}
 
 %description datanode
 The Data Nodes in the Hadoop Cluster are responsible for serving up
@@ -211,6 +215,7 @@ blocks of data over the network to Hadoo
 Summary: Hadoop Task Tracker
 Group: System/Daemons
 Requires: %{name} = %{version}-%{release}
+Requires(pre): %{name} = %{version}-%{release}
 
 %description tasktracker
 The tasktracker has a fixed number of work slots.  The jobtracker
@@ -230,7 +235,6 @@ where each Hadoop daemon runs in a separ
 %package doc
 Summary: Hadoop Documentation
 Group: Documentation
-Obsoletes: %{name}-docs
 %description doc
 Documentation for Hadoop
 

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec Tue Jan 31 20:22:33 2012
@@ -98,6 +98,7 @@ Summary: The Hadoop HBase master Server.
 Group: System/Daemons
 Provides: %{name}-master
 Requires: %{name} = %{version}-%{release}
+Requires(pre): %{name} = %{version}-%{release}
 
 %if  %{?suse_version:1}0
 # Required for init scripts
@@ -124,6 +125,7 @@ Summary: The Hadoop HBase RegionServer s
 Group: System/Daemons
 Provides: %{name}-regionserver
 Requires: %{name} = %{version}-%{release}
+Requires(pre): %{name} = %{version}-%{release}
 
 %if  %{?suse_version:1}0
 # Required for init scripts
@@ -151,6 +153,7 @@ Summary: The Hadoop HBase Thrift Interfa
 Group: System/Daemons
 Provides: %{name}-thrift
 Requires: %{name} = %{version}-%{release}
+Requires(pre): %{name} = %{version}-%{release}
 
 %if  %{?suse_version:1}0
 # Required for init scripts

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hive/SPECS/hive.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hive/SPECS/hive.spec?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hive/SPECS/hive.spec (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/hive/SPECS/hive.spec Tue Jan 31 20:22:33 2012
@@ -80,6 +80,7 @@ Summary: Provides a Hive Thrift service.
 Group: System/Daemons
 Provides: %{name}-server
 Requires: %{name} = %{version}-%{release}
+Requires(pre): %{name} = %{version}-%{release}
 
 %if  %{?suse_version:1}0
 # Required for init scripts
@@ -98,6 +99,7 @@ Summary: Shared metadata repository for 
 Group: System/Daemons
 Provides: %{name}-metastore
 Requires: %{name} = %{version}-%{release}
+Requires(pre): %{name} = %{version}-%{release}
 
 %if  %{?suse_version:1}0
 # Required for init scripts
@@ -183,7 +185,7 @@ fi
 %{var_lib_hive}
 %attr(0755,hive,hive) %dir %{_localstatedir}/log/%{name}
 %attr(0755,hive,hive) %dir %{_localstatedir}/run/%{name}
-%attr(1777,root,root) %{var_lib_hive}/metastore
+%attr(1777,hive,hive) %{var_lib_hive}/metastore
 %doc %{doc_hive}
 %{man_dir}/man1/hive.1.*
 

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec Tue Jan 31 20:22:33 2012
@@ -54,6 +54,7 @@ URL: http://incubator.apache.org/sqoop/
 Group: System/Daemons
 Provides: sqoop-metastore
 Requires: sqoop = %{version}-%{release} 
+Requires(pre): %{name} = %{version}-%{release}
 
 %if  %{?suse_version:1}0
 # Required for init scripts

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec Tue Jan 31 20:22:33 2012
@@ -28,12 +28,12 @@ Name: whirr
 Version: %{whirr_version}
 Release: %{whirr_release}
 Summary: Scripts and libraries for running software services on cloud infrastructure.
-URL: http://incubator.apache.org/whirr
+URL: http://whirr.apache.org/
 Group: Development/Libraries
 BuildArch: noarch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 License: ASL 2.0 
-Source0: %{name}-%{whirr_base_version}-incubating-src.tar.gz
+Source0: %{name}-%{whirr_base_version}.tar.gz
 Source1: do-component-build
 Source2: install_%{name}.sh
 Source3: whirr.1
@@ -51,7 +51,7 @@ Whirr provides
     
 
 %prep
-%setup -n %{name}-%{whirr_base_version}-incubating
+%setup -n %{name}-%{whirr_base_version}
 
 %build
 bash %{SOURCE1}

Modified: incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec (original)
+++ incubator/bigtop/branches/RCs/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec Tue Jan 31 20:22:33 2012
@@ -96,6 +96,7 @@ Summary: The Hadoop Zookeeper server
 Group: System/Daemons
 Provides: %{svc_zookeeper}
 Requires: %{name} = %{version}-%{release}
+Requires(pre): %{name} = %{version}-%{release}
 Requires(post): %{chkconfig_dep}
 Requires(preun): %{service_dep}, %{chkconfig_dep}
 BuildArch: noarch

Modified: incubator/bigtop/branches/RCs/bigtop.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop.mk?rev=1238787&r1=1238786&r2=1238787&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop.mk (original)
+++ incubator/bigtop/branches/RCs/bigtop.mk Tue Jan 31 20:22:33 2012
@@ -18,12 +18,14 @@ BIGTOP_VERSION=0.3.0-incubating
 # Hadoop 0.20.0-based hadoop package
 HADOOP_NAME=hadoop
 HADOOP_RELNOTES_NAME=Apache Hadoop
-HADOOP_BASE_VERSION=1.0.0
-HADOOP_PKG_VERSION=1.0.0
+HADOOP_BASE_VERSION=1.0.1
+HADOOP_PKG_VERSION=$(HADOOP_BASE_VERSION)
 HADOOP_RELEASE_VERSION=1
 HADOOP_TARBALL_DST=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION).tar.gz
-HADOOP_TARBALL_SRC=$(HADOOP_TARBALL_DST)
-HADOOP_SITE=$(APACHE_MIRROR)/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)/
+#HADOOP_TARBALL_SRC=$(HADOOP_TARBALL_DST)
+#HADOOP_SITE=$(APACHE_MIRROR)/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)/
+HADOOP_TARBALL_SRC=85219d646877f71730fefbefec7c5448ec0ccc15
+HADOOP_SITE=https://github.com/apache/hadoop-common/tarball
 $(eval $(call PACKAGE,hadoop,HADOOP))
 
 # ZooKeeper
@@ -47,12 +49,11 @@ HBASE_PKG_VERSION=$(HBASE_BASE_VERSION)
 HBASE_RELEASE_VERSION=1
 HBASE_TARBALL_DST=hbase-$(HBASE_BASE_VERSION).tar.gz
 HBASE_TARBALL_SRC=$(HBASE_TARBALL_DST)
-#HBASE_SITE=$(APACHE_MIRROR)/hbase/hbase-0.90.4/
-HBASE_SITE=http://people.apache.org/~stack/hbase-0.92.0-candidate-3/
+HBASE_SITE=$(APACHE_MIRROR)/hbase/hbase-$(HBASE_BASE_VERSION)/
 $(eval $(call PACKAGE,hbase,HBASE))
 
 # Pig
-PIG_BASE_VERSION=0.9.1
+PIG_BASE_VERSION=0.9.2
 PIG_PKG_VERSION=$(PIG_BASE_VERSION)
 PIG_RELEASE_VERSION=1
 PIG_NAME=pig
@@ -67,7 +68,7 @@ $(eval $(call PACKAGE,pig,PIG))
 HIVE_NAME=hive
 HIVE_RELNOTES_NAME=Apache Hive
 HIVE_PKG_NAME=hive
-HIVE_BASE_VERSION=0.7.1
+HIVE_BASE_VERSION=0.8.1
 HIVE_PKG_VERSION=$(HIVE_BASE_VERSION)
 HIVE_RELEASE_VERSION=1
 HIVE_TARBALL_DST=hive-$(HIVE_BASE_VERSION).tar.gz
@@ -76,17 +77,16 @@ HIVE_SITE=$(APACHE_MIRROR)/hive/hive-$(H
 $(eval $(call PACKAGE,hive,HIVE))
 
 # Sqoop
-# FIXME: disabled because of BIGTOP-203
-# SQOOP_NAME=sqoop
-# SQOOP_RELNOTES_NAME=Sqoop
-# SQOOP_PKG_NAME=sqoop
-# SQOOP_BASE_VERSION=1.3.0
-# SQOOP_PKG_VERSION=1.3.0
-# SQOOP_RELEASE_VERSION=1
-# SQOOP_TARBALL_DST=sqoop-$(SQOOP_BASE_VERSION).tar.gz
-# SQOOP_TARBALL_SRC=$(SQOOP_TARBALL_DST)
-# SQOOP_SITE=http://github.com/downloads/cloudera/sqoop/
-# $(eval $(call PACKAGE,sqoop,SQOOP))
+SQOOP_NAME=sqoop
+SQOOP_RELNOTES_NAME=Sqoop
+SQOOP_PKG_NAME=sqoop
+SQOOP_BASE_VERSION=1.4.0-incubating
+SQOOP_PKG_VERSION=1.4.0
+SQOOP_RELEASE_VERSION=1
+SQOOP_TARBALL_DST=$(SQOOP_NAME)-$(SQOOP_BASE_VERSION).tar.gz
+SQOOP_TARBALL_SRC=$(SQOOP_TARBALL_DST)
+SQOOP_SITE=$(APACHE_MIRROR)/incubator/$(SQOOP_NAME)/$(SQOOP_NAME)-$(SQOOP_BASE_VERSION)/
+$(eval $(call PACKAGE,sqoop,SQOOP))
 
 # Oozie
 OOZIE_NAME=oozie
@@ -104,12 +104,12 @@ $(eval $(call PACKAGE,oozie,OOZIE))
 WHIRR_NAME=whirr
 WHIRR_RELNOTES_NAME=Apache Whirr
 WHIRR_PKG_NAME=whirr
-WHIRR_BASE_VERSION=0.5.0
-WHIRR_PKG_VERSION=0.5.0
+WHIRR_BASE_VERSION=0.7.0
+WHIRR_PKG_VERSION=0.7.0
 WHIRR_RELEASE_VERSION=1
-WHIRR_TARBALL_DST=whirr-$(WHIRR_BASE_VERSION)-incubating-src.tar.gz
+WHIRR_TARBALL_DST=whirr-$(WHIRR_BASE_VERSION).tar.gz
 WHIRR_TARBALL_SRC=$(WHIRR_TARBALL_DST)
-WHIRR_SITE=$(APACHE_ARCHIVE)//incubator/whirr/whirr-0.5.0-incubating/
+WHIRR_SITE=$(APACHE_ARCHIVE)/whirr/whirr-$(WHIRR_BASE_VERSION)/
 $(eval $(call PACKAGE,whirr,WHIRR))
 
 # Mahout
@@ -128,12 +128,12 @@ $(eval $(call PACKAGE,mahout,MAHOUT))
 FLUME_NAME=flume
 FLUME_RELNOTES_NAME=Flume
 FLUME_PKG_NAME=flume
-FLUME_BASE_VERSION=0.9.3
-FLUME_PKG_VERSION=0.9.3
+FLUME_BASE_VERSION=1.0.0-incubating
+FLUME_PKG_VERSION=1.0.0
 FLUME_RELEASE_VERSION=1
-FLUME_TARBALL_DST=flume-$(FLUME_BASE_VERSION).tar.gz
-FLUME_TARBALL_SRC=$(FLUME_TARBALL_DST)
-FLUME_SITE=http://github.com/downloads/cloudera/flume/
+FLUME_TARBALL_DST=$(FLUME_NAME)-$(FLUME_BASE_VERSION).tar.gz
+FLUME_TARBALL_SRC=$(FLUME_NAME)-$(FLUME_BASE_VERSION).tar.gz
+FLUME_SITE=$(APACHE_MIRROR)/incubator/$(FLUME_NAME)/$(FLUME_NAME)-$(FLUME_BASE_VERSION)/
 $(eval $(call PACKAGE,flume,FLUME))
 
 # Bigtop-utils



Mime
View raw message