Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDDS-672. Spark shell throws OzoneFileSystem not found. 

Contributed by Anu Engineer.
This commit is contained in:
Anu Engineer 2018-10-19 09:22:46 -07:00
parent b22651e949
commit cd057918d6
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/OzoneFileSystem.java
View File

@ -31,6 +31,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -97,7 +98,11 @@ public class OzoneFileSystem extends FileSystem {
@Override @Override
public void initialize(URI name, Configuration conf) throws IOException { public void initialize(URI name, Configuration conf) throws IOException {
super.initialize(name, conf); super.initialize(name, conf);
setConf(conf); if(!(conf instanceof OzoneConfiguration)) {
setConf(new OzoneConfiguration(conf));
} else {
setConf(conf);
}
Objects.requireNonNull(name.getScheme(), "No scheme provided in " + name); Objects.requireNonNull(name.getScheme(), "No scheme provided in " + name);
assert getScheme().equals(name.getScheme()); assert getScheme().equals(name.getScheme());
@ -116,15 +121,15 @@ public class OzoneFileSystem extends FileSystem {
uri = new URIBuilder().setScheme(OZONE_URI_SCHEME) uri = new URIBuilder().setScheme(OZONE_URI_SCHEME)
.setHost(authority).build(); .setHost(authority).build();
LOG.trace("Ozone URI for ozfs initialization is " + uri); LOG.trace("Ozone URI for ozfs initialization is " + uri);
this.ozoneClient = OzoneClientFactory.getRpcClient(conf); this.ozoneClient = OzoneClientFactory.getRpcClient(getConf());
objectStore = ozoneClient.getObjectStore(); objectStore = ozoneClient.getObjectStore();
this.volume = objectStore.getVolume(volumeStr); this.volume = objectStore.getVolume(volumeStr);
this.bucket = volume.getBucket(bucketStr); this.bucket = volume.getBucket(bucketStr);
this.replicationType = ReplicationType.valueOf( this.replicationType = ReplicationType.valueOf(
conf.get(OzoneConfigKeys.OZONE_REPLICATION_TYPE, getConf().get(OzoneConfigKeys.OZONE_REPLICATION_TYPE,
OzoneConfigKeys.OZONE_REPLICATION_TYPE_DEFAULT)); OzoneConfigKeys.OZONE_REPLICATION_TYPE_DEFAULT));
this.replicationFactor = ReplicationFactor.valueOf( this.replicationFactor = ReplicationFactor.valueOf(
conf.getInt(OzoneConfigKeys.OZONE_REPLICATION, getConf().getInt(OzoneConfigKeys.OZONE_REPLICATION,
OzoneConfigKeys.OZONE_REPLICATION_DEFAULT)); OzoneConfigKeys.OZONE_REPLICATION_DEFAULT));
try { try {
this.userName = this.userName =