Merge d15d042 into d282c44

uwescience · Feb 20, 2017 · eed0458 · eed0458
2 parents d282c44 + d15d042
commit eed0458
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/edu/washington/escience/myria/io/AmazonS3Source.java b/src/edu/washington/escience/myria/io/AmazonS3Source.java
@@ -14,6 +14,7 @@
 
 import org.apache.commons.httpclient.URIException;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.s3a.AnonymousAWSCredentialsProvider;
 
 import com.amazonaws.ClientConfiguration;
 import com.amazonaws.auth.AWSCredentialsProvider;
@@ -80,7 +81,9 @@ public AmazonS3Client getS3Client() throws MyriaApiException {
       String propertyName = "fs.s3a.aws.credentials.provider";
       String className = conf.getTrimmed(propertyName);
       if (className == null) {
-        throw new MyriaApiException(Status.INTERNAL_SERVER_ERROR, propertyName + " does not exist");
+        LOGGER.warn(
+            "No AWS credentials provider property found in Hadoop configuration file. Instantiating the AmazonS3Client with anonymous credentials.");
+        credentials = new AnonymousAWSCredentialsProvider();
       }
       try {
         Class<?> credentialClass = Class.forName(className);