Skip to content

[FLINK-3556] [runtime] Remove false check in HA blob store configuration #1749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
uce wants to merge 2 commits into from
Closed

[FLINK-3556] [runtime] Remove false check in HA blob store configuration #1749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b2b6a8
[FLINK-3556] [runtime] Remove false check in HA blob store configuration
uce Mar 1, 2016
345ee47
[pr-comments] Check config in FileSystemBlobStore
uce Mar 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.apache.flink.api.common.JobID;
import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.IllegalConfigurationException;
import org.apache.flink.runtime.jobmanager.RecoveryMode;
import org.apache.flink.util.NetUtils;
import org.slf4j.Logger;
Expand Down Expand Up @@ -99,16 +100,11 @@ public BlobServer(Configuration config) throws IOException {
if (recoveryMode == RecoveryMode.STANDALONE) {
this.blobStore = new VoidBlobStore();
}
// Recovery. Check that everything has been setup correctly. This is not clean, but it's
// better to resolve this with some upcoming changes to the state backend setup.
else if (config.containsKey(ConfigConstants.STATE_BACKEND) &&
config.containsKey(ConfigConstants.ZOOKEEPER_RECOVERY_PATH)) {

// Recovery.
else if (recoveryMode == RecoveryMode.ZOOKEEPER) {
this.blobStore = new FileSystemBlobStore(config);
}
// Fallback.
else {
this.blobStore = new VoidBlobStore();
} else {
throw new IllegalConfigurationException("Unexpected recovery mode '" + recoveryMode + ".");
}

// configure the maximum number of concurrent connections
Expand Down
15 changes: 7 additions & 8 deletions flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@

/**
* Blob store backed by {@link FileSystem}.
*
* <p>This is used in addition to the local blob storage
*/
class FileSystemBlobStore implements BlobStore {

Expand All @@ -49,18 +51,15 @@ class FileSystemBlobStore implements BlobStore {
private final String basePath;

FileSystemBlobStore(Configuration config) throws IOException {
String stateBackendBasePath = config.getString(
ConfigConstants.ZOOKEEPER_RECOVERY_PATH, "");
String recoveryPath = config.getString(ConfigConstants.ZOOKEEPER_RECOVERY_PATH, null);

if (stateBackendBasePath.equals("")) {
if (recoveryPath == null) {
throw new IllegalConfigurationException(String.format("Missing configuration for " +
"file system state backend recovery path. Please specify via " +
"'%s' key.", ConfigConstants.ZOOKEEPER_RECOVERY_PATH));
"file system state backend recovery path. Please specify via " +
"'%s' key.", ConfigConstants.ZOOKEEPER_RECOVERY_PATH));
}

stateBackendBasePath += "/blob";

this.basePath = stateBackendBasePath;
this.basePath = recoveryPath + "/blob";

FileSystem.get(new Path(basePath).toUri()).mkdirs(new Path(basePath));
LOG.info("Created blob directory {}.", basePath);
Expand Down
1 change: 0 additions & 1 deletion flink-runtime/src/main/java/org/apache/flink/runtime/util/ZooKeeperUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,6 @@ public static CompletedCheckpointStore createCompletedCheckpoints(
ConfigConstants.ZOOKEEPER_CHECKPOINTS_PATH,
ConfigConstants.DEFAULT_ZOOKEEPER_CHECKPOINTS_PATH);


StateStorageHelper<CompletedCheckpoint> stateStorage = createFileSystemStateStorage(
configuration,
"completedCheckpoint");
Expand Down