You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2014/05/23 19:17:13 UTC

git commit: Added support for s3/s3n to the mesos fetcher.

Repository: mesos
Updated Branches:
  refs/heads/master 0aa8ddd0c -> 96f590b3f


Added support for s3/s3n to the mesos fetcher.

Review: https://reviews.apache.org/r/21852


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/96f590b3
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/96f590b3
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/96f590b3

Branch: refs/heads/master
Commit: 96f590b3f4e334b47c9a6233d777af7b850a4faf
Parents: 0aa8ddd
Author: Tom Arnfeld <ta...@me.com>
Authored: Fri May 23 10:16:42 2014 -0700
Committer: Vinod Kone <vi...@twitter.com>
Committed: Fri May 23 10:16:42 2014 -0700

----------------------------------------------------------------------
 src/launcher/fetcher.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/96f590b3/src/launcher/fetcher.cpp
----------------------------------------------------------------------
diff --git a/src/launcher/fetcher.cpp b/src/launcher/fetcher.cpp
index 8c9e20d..c4425eb 100644
--- a/src/launcher/fetcher.cpp
+++ b/src/launcher/fetcher.cpp
@@ -82,11 +82,14 @@ Try<string> fetch(
     return Error("Illegal characters in URI");
   }
 
-  // Grab the resource from HDFS if its path begins with hdfs:// or
-  // hftp:
+  // Grab the resource using the hadoop client if it's one of the known schemes
+  // TODO(tarnfeld): This isn't very scalable with hadoop's pluggable
+  // filesystem implementations.
   // TODO(matei): Enforce some size limits on files we get from HDFS
   if (strings::startsWith(uri, "hdfs://") ||
-      strings::startsWith(uri, "hftp://")) {
+      strings::startsWith(uri, "hftp://") ||
+      strings::startsWith(uri, "s3://") ||
+      strings::startsWith(uri, "s3n://")) {
     Try<string> base = os::basename(uri);
     if (base.isError()) {
       LOG(ERROR) << "Invalid basename for URI: " << base.error();