honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 10:25:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't throw exceptions from ctor, guice is hell

Browse Source
This commit is contained in:
Robert Muir 2015-12-19 02:09:14 -05:00
parent f174e96a14
commit 3269beeb4d
4 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
plugins/repository-hdfs/src/main/java/org/elasticsearch/repositories/hdfs/HdfsRepository.java
View File

@ -55,38 +55,50 @@ public class HdfsRepository extends BlobStoreRepository implements FileContextFa
public final static String TYPE = "hdfs";
private final HdfsBlobStore blobStore;
private final BlobPath basePath;
private final ByteSizeValue chunkSize;
private final boolean compress;
private final RepositorySettings repositorySettings;
private final ThreadPool threadPool;
private final String path;
private FileContext fc;
private HdfsBlobStore blobStore;
@Inject
public HdfsRepository(RepositoryName name, RepositorySettings repositorySettings, IndexShardRepository indexShardRepository, ThreadPool threadPool) throws IOException {
super(name.getName(), repositorySettings, indexShardRepository);
this.repositorySettings = repositorySettings;
this.threadPool = threadPool;
String path = repositorySettings.settings().get("path", settings.get("path"));
path = repositorySettings.settings().get("path", settings.get("path"));
this.basePath = BlobPath.cleanPath();
this.chunkSize = repositorySettings.settings().getAsBytesSize("chunk_size", settings.getAsBytesSize("chunk_size", null));
this.compress = repositorySettings.settings().getAsBoolean("compress", settings.getAsBoolean("compress", false));
}
@Override
protected void doStart() {
// get configuration
if (path == null) {
throw new IllegalArgumentException("no 'path' defined for hdfs snapshot/restore");
}
// get configuration
fc = getFileContext();
Path hdfsPath = SecurityUtils.execute(fc, new FcCallback<Path>() {
@Override
public Path doInHdfs(FileContext fc) throws IOException {
return fc.makeQualified(new Path(path));
}
});
this.basePath = BlobPath.cleanPath();
logger.debug("Using file-system [{}] for URI [{}], path [{}]", fc.getDefaultFileSystem(), fc.getDefaultFileSystem().getUri(), hdfsPath);
blobStore = new HdfsBlobStore(settings, this, hdfsPath, threadPool);
this.chunkSize = repositorySettings.settings().getAsBytesSize("chunk_size", settings.getAsBytesSize("chunk_size", null));
this.compress = repositorySettings.settings().getAsBoolean("compress", settings.getAsBoolean("compress", false));
try {
fc = getFileContext();
Path hdfsPath = SecurityUtils.execute(fc, new FcCallback<Path>() {
@Override
public Path doInHdfs(FileContext fc) throws IOException {
return fc.makeQualified(new Path(path));
}
});
logger.debug("Using file-system [{}] for URI [{}], path [{}]", fc.getDefaultFileSystem(), fc.getDefaultFileSystem().getUri(), hdfsPath);
blobStore = new HdfsBlobStore(settings, this, hdfsPath, threadPool);
} catch (IOException e) {
throw new RuntimeException(e);
}
super.doStart();
}
// as the FileSystem is long-lived and might go away, make sure to check it before it's being used.

2
plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/20_repository.yaml
View File

@ -10,7 +10,7 @@
body:
type: hdfs
settings:
uri: "hdfs://localhost:36909"
uri: "hdfs://localhost:40737"
path: "foo/bar"
# Get repository

2
plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/30_snapshot.yaml
View File

@ -12,7 +12,7 @@ setup:
body:
type: hdfs
settings:
uri: "hdfs://localhost:36909"
uri: "hdfs://localhost:40737"
path: "foo/bar"
- do:

2
plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/40_restore.yaml
View File

@ -12,7 +12,7 @@ setup:
body:
type: hdfs
settings:
uri: "hdfs://localhost:36909"
uri: "hdfs://localhost:40737"
path: "foo/bar"
- do: