Skip to content

Commit

Permalink
[FLINK-2354] [runtime] Replace old StateHandleProvider by StateStorag…
Browse files Browse the repository at this point in the history
…eHelper in ZooKeeperStateHandleStore

The old StateHandleProvider used in ZooKeeperStateHandleStore had to be replaced because the state backend implementation has changed. Since the new state backend could not be used anymore, a new StateStorageHelper interface has been created. The default implementation FileSystemStateStorageHelper stores the given state onto the specified file system and returns a FileSerializableStateHandle.

Various fixes due to rebasing.
  • Loading branch information
tillrohrmann committed Oct 20, 2015
1 parent 630798d commit a6890b2
Show file tree
Hide file tree
Showing 98 changed files with 668 additions and 1,710 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,6 @@ public WebRuntimeMonitor(

// job manager configuration, log and stdout
.GET("/jobmanager/config", handler(new JobManagerConfigHandler(config)))
.GET("/jobmanager/log", new StaticFileServerHandler(logDir))
.GET("/jobmanager/stdout", new StaticFileServerHandler(outDir))

// overview over jobs
.GET("/joboverview", handler(new CurrentJobsOverviewHandler(DEFAULT_REQUEST_TIMEOUT, true, true)))
Expand Down Expand Up @@ -222,6 +220,8 @@ public WebRuntimeMonitor(
.GET("/taskmanagers", handler(new TaskManagersHandler(DEFAULT_REQUEST_TIMEOUT)))
.GET("/taskmanagers/:" + TaskManagersHandler.TASK_MANAGER_ID_KEY, handler(new TaskManagersHandler(DEFAULT_REQUEST_TIMEOUT)))

.GET("/jobmanager/log", new StaticFileServerHandler(retriever, jobManagerAddressPromise.future(), timeout, logDir))
.GET("/jobmanager/stdout", new StaticFileServerHandler(retriever, jobManagerAddressPromise.future(), timeout, outDir))
// this handler serves all the static contents
.GET("/:*", new StaticFileServerHandler(retriever, jobManagerAddressPromise.future(), timeout, webRootDir));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,12 @@

import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.FilenameFilter;
import java.io.RandomAccessFile;
import java.nio.file.Files;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
Expand Down Expand Up @@ -198,7 +200,7 @@ public void channelRead0(ChannelHandlerContext ctx, Routed routed) throws Except
* Response when running with leading JobManager.
*/
private void respondAsLeader(ChannelHandlerContext ctx, HttpRequest request, String requestPath)
throws ParseException, IOException {
throws IOException, ParseException {

// convert to absolute path
final File file = new File(rootPath, requestPath);
Expand Down
Loading

0 comments on commit a6890b2

Please sign in to comment.