Author: tomwhite
Date: Tue Nov 25 04:00:14 2008
New Revision: 720476

URL: http://svn.apache.org/viewvc?rev=720476&view=rev
Log:
HADOOP-4422. S3 file systems should not create bucket. Contributed by David 
Phillips.

Modified:
    hadoop/core/trunk/CHANGES.txt
    
hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
    
hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=720476&r1=720475&r2=720476&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Tue Nov 25 04:00:14 2008
@@ -41,6 +41,9 @@
       JobClient::getCommandLineConfig is removed
       JobShell, TestJobShell classes are removed
 
+    HADOOP-4422. S3 file systems should not create bucket.
+    (David Phillips via tomwhite)
+
   NEW FEATURES
 
     HADOOP-4575. Add a proxy service for relaying HsftpFileSystem requests.

Modified: 
hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java?rev=720476&r1=720475&r2=720476&view=diff
==============================================================================
--- 
hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java 
(original)
+++ 
hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java 
Tue Nov 25 04:00:14 2008
@@ -93,22 +93,9 @@
     }
     bucket = new S3Bucket(uri.getHost());
 
-    createBucket(bucket.getName());
-    
     this.bufferSize = conf.getInt("io.file.buffer.size", 4096);
   }
 
-  private void createBucket(String bucketName) throws IOException {
-    try {
-      s3Service.createBucket(bucketName);
-    } catch (S3ServiceException e) {
-      if (e.getCause() instanceof IOException) {
-        throw (IOException) e.getCause();
-      }
-      throw new S3Exception(e);
-    }
-  }
-  
   public String getVersion() throws IOException {
     return FILE_SYSTEM_VERSION_VALUE;
   }

Modified: 
hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java?rev=720476&r1=720475&r2=720476&view=diff
==============================================================================
--- 
hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java
 (original)
+++ 
hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java
 Tue Nov 25 04:00:14 2008
@@ -59,20 +59,6 @@
       throw new S3Exception(e);
     }
     bucket = new S3Bucket(uri.getHost());
-
-    createBucket(bucket.getName());
-
-  }
-  
-  private void createBucket(String bucketName) throws IOException {
-    try {
-      s3Service.createBucket(bucketName);
-    } catch (S3ServiceException e) {
-      if (e.getCause() instanceof IOException) {
-        throw (IOException) e.getCause();
-      }
-      throw new S3Exception(e);
-    }
   }
   
   public void storeFile(String key, File file, byte[] md5Hash)


Reply via email to