Merge branch 'master' of https://github.com/0xdata/h2o

lovearthas · Aug 5, 2014 · 732fe11 · 732fe11
2 parents e257f0e + 12d5cf7
commit 732fe11
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/py/h2o_import.py b/py/h2o_import.py
@@ -251,6 +251,10 @@ def import_only(node=None, schema='local', bucket=None, path=None,
 
         n = h2o.nodes[0]
         if schema=='s3' or node.redirect_import_folder_to_s3_path:
+            # FIX! hack for now...when we change import folder to import s3, point to unique bucket name for h2o
+            # should probably deal with this up in the bucket resolution 
+            # this may change other cases, but smalldata should only exist as a "bucket" for us?
+            re.sub("smalldata", "h2o-smalldata", folderOffset)
             folderURI = "s3://" + folderOffset
             if not n.aws_credentials:
                 print "aws_credentials: %s" % n.aws_credentials
@@ -263,6 +267,10 @@ def import_only(node=None, schema='local', bucket=None, path=None,
                 importResult = node.import_files(folderURI + "/" + pattern, timeoutSecs=timeoutSecs)
 
         elif schema=='s3n' or node.redirect_import_folder_to_s3n_path:
+            # FIX! hack for now...when we change import folder to import s3, point to unique bucket name for h2o
+            # should probably deal with this up in the bucket resolution 
+            # this may change other cases, but smalldata should only exist as a "bucket" for us?
+            re.sub("smalldata", "h2o-smalldata", folderOffset)
             if not (n.use_hdfs and ((n.hdfs_version and n.hdfs_name_node) or n.hdfs_config)):
                 print "use_hdfs: %s hdfs_version: %s hdfs_name_node: %s hdfs_config: %s" % \
                     (n.use_hdfs, n.hdfs_version, n.hdfs_name_node, n.hdfs_config)