Author: cutting
Date: Wed Aug 15 13:28:50 2007
New Revision: 566327
URL: http://svn.apache.org/viewvc?view=rev&rev=566327
Log:
Merge -r 566325:566326 from trunk to 0.14 branch. Fixes: HADOOP-1717.
Modified:
lucene/hadoop/branches/branch-0.14/CHANGES.txt
lucene/hadoop/branches/branch-0.14/src/test/org/apache/hadoop/dfs/TestDFSUpgradeFromImage.java
Modified: lucene/hadoop/branches/branch-0.14/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.14/CHANGES.txt?view=diff&rev=566327&r1=566326&r2=566327
==============================================================================
--- lucene/hadoop/branches/branch-0.14/CHANGES.txt (original)
+++ lucene/hadoop/branches/branch-0.14/CHANGES.txt Wed Aug 15 13:28:50 2007
@@ -529,6 +529,9 @@
157. HADOOP-1712. Fix an unhandled exception on datanode during block
CRC upgrade. (Raghu Angadi via cutting)
+158. HADOOP-1717. Fix TestDFSUpgradeFromImage to work on Solaris.
+ (nigel via cutting)
+
Release 0.13.0 - 2007-06-08
Modified:
lucene/hadoop/branches/branch-0.14/src/test/org/apache/hadoop/dfs/TestDFSUpgradeFromImage.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.14/src/test/org/apache/hadoop/dfs/TestDFSUpgradeFromImage.java?view=diff&rev=566327&r1=566326&r2=566327
==============================================================================
---
lucene/hadoop/branches/branch-0.14/src/test/org/apache/hadoop/dfs/TestDFSUpgradeFromImage.java
(original)
+++
lucene/hadoop/branches/branch-0.14/src/test/org/apache/hadoop/dfs/TestDFSUpgradeFromImage.java
Wed Aug 15 13:28:50 2007
@@ -68,11 +68,11 @@
if ( dfsDir.exists() && !FileUtil.fullyDelete(dfsDir) ) {
throw new IOException("Could not delete dfs directory '" + dfsDir + "'");
}
-
- LOG.info("Unpacking the tar file " + tarFile);
- String[] cmd = { "tar", "-zxf", FileUtil.makeShellPath(tarFile),
- "-C", FileUtil.makeShellPath(dataDir) };
- Command.execCommand(cmd);
+ String cmd = "bash -c \"gzip -dc '" + FileUtil.makeShellPath(tarFile) + "'
| (cd '" +
+ FileUtil.makeShellPath(dataDir) + "' ; tar -xf -)\"";
+ LOG.info("Unpacking the tar file. Cmd : " + cmd);
+ String[] shellCmd = { "sh", "-c", cmd };
+ Command.execCommand(shellCmd);
//Now read the reference info
