Author: omalley
Date: Thu Jul 21 19:03:24 2011
New Revision: 1149316
URL: http://svn.apache.org/viewvc?rev=1149316&view=rev
Log:
HADOOP-7475. Fix hadoop-setup-single-node.sh to reflect new layout. (eyang
via omalley)
Modified:
hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
hadoop/common/branches/branch-0.20-security-204/src/packages/hadoop-setup-conf.sh
hadoop/common/branches/branch-0.20-security-204/src/packages/rpm/spec/hadoop.spec
hadoop/common/branches/branch-0.20-security-204/src/packages/update-hadoop-env.sh
Modified: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt?rev=1149316&r1=1149315&r2=1149316&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-204/CHANGES.txt Thu Jul 21
19:03:24 2011
@@ -13,6 +13,9 @@ Release 0.20.204.0 - unreleased
BUG FIXES
+ HADOOP-7475. Fix hadoop-setup-single-node.sh to reflect new layout. (eyang
+ via omalley)
+
HADOOP-7045. TestDU fails on systems with local file systems with
extended attributes. (eli)
@@ -45,8 +48,8 @@ Release 0.20.204.0 - unreleased
HADOOP-7248. Update eclipse target to generate .classpath from ivy config.
(Thomas Graves and Tom White via cdouglas)
- MAPREDUCE-2558. Add queue-level metrics 0.20-security branch - test fix
- (jeffrey nasbit via mahadev)
+ MAPREDUCE-2558. Add queue-level metrics 0.20-security branch (test fixes)
+ (Jeffrey Naisbitt via mahadev)
HADOOP-7364. TestMiniMRDFSCaching fails if test.build.dir is set to
something other than build/test. (Thomas Graves via mahadev)
Modified:
hadoop/common/branches/branch-0.20-security-204/src/packages/hadoop-setup-conf.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/src/packages/hadoop-setup-conf.sh?rev=1149316&r1=1149315&r2=1149316&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-204/src/packages/hadoop-setup-conf.sh
(original)
+++
hadoop/common/branches/branch-0.20-security-204/src/packages/hadoop-setup-conf.sh
Thu Jul 21 19:03:24 2011
@@ -233,10 +233,10 @@ rm -f hdfs-site.xml >/dev/null
rm -f mapred-site.xml >/dev/null
rm -f hadoop-env.sh >/dev/null
-template_generator ${HADOOP_HOME}/templates/conf/core-site.xml core-site.xml
-template_generator ${HADOOP_HOME}/templates/conf/hdfs-site.xml hdfs-site.xml
-template_generator ${HADOOP_HOME}/templates/conf/mapred-site.xml
mapred-site.xml
-template_generator ${HADOOP_HOME}/templates/conf/hadoop-env.sh hadoop-env.sh
+template_generator ${HADOOP_PREFIX}/share/hadoop/templates/conf/core-site.xml
core-site.xml
+template_generator ${HADOOP_PREFIX}/share/hadoop/templates/conf/hdfs-site.xml
hdfs-site.xml
+template_generator
${HADOOP_PREFIX}/share/hadoop/templates/conf/mapred-site.xml mapred-site.xml
+template_generator ${HADOOP_PREFIX}/share/hadoop/templates/conf/hadoop-env.sh
hadoop-env.sh
chown root:hadoop hadoop-env.sh
chmod 755 hadoop-env.sh
Modified:
hadoop/common/branches/branch-0.20-security-204/src/packages/rpm/spec/hadoop.spec
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/src/packages/rpm/spec/hadoop.spec?rev=1149316&r1=1149315&r2=1149316&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-204/src/packages/rpm/spec/hadoop.spec
(original)
+++
hadoop/common/branches/branch-0.20-security-204/src/packages/rpm/spec/hadoop.spec
Thu Jul 21 19:03:24 2011
@@ -149,8 +149,8 @@ fi
%pre
getent group hadoop 2>/dev/null >/dev/null || /usr/sbin/groupadd -r hadoop
-/usr/sbin/useradd --comment "Hadoop MapReduce" --shell /bin/bash -M -r
--groups hadoop --home /tmp mapred 2> /dev/null || :
-/usr/sbin/useradd --comment "Hadoop HDFS" --shell /bin/bash -M -r --groups
hadoop --home /tmp hdfs 2> /dev/null || :
+/usr/sbin/useradd --comment "Hadoop MapReduce" --shell /bin/bash -M -r -g
hadoop --home /tmp mapred 2> /dev/null || :
+/usr/sbin/useradd --comment "Hadoop HDFS" --shell /bin/bash -M -r -g hadoop
--home /tmp hdfs 2> /dev/null || :
%post
bash ${RPM_INSTALL_PREFIX0}/sbin/update-hadoop-env.sh \
Modified:
hadoop/common/branches/branch-0.20-security-204/src/packages/update-hadoop-env.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/src/packages/update-hadoop-env.sh?rev=1149316&r1=1149315&r2=1149316&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-204/src/packages/update-hadoop-env.sh
(original)
+++
hadoop/common/branches/branch-0.20-security-204/src/packages/update-hadoop-env.sh
Thu Jul 21 19:03:24 2011
@@ -171,7 +171,7 @@ else
HADOOP_LOG_DIR=${LOG_DIR}
HADOOP_PID_DIR=${PID_DIR}
HADOOP_PREFIX=${PREFIX}
- HADOOP_HOME=${PREFIX}/share/hadoop
+ HADOOP_HOME=${PREFIX}
template_generator ${PREFIX}/share/hadoop/templates/conf/hadoop-env.sh $TFILE
cp ${TFILE} ${CONF_DIR}/hadoop-env.sh
rm -f ${TFILE}
