This is an automated email from the ASF dual-hosted git repository.
leesf pushed a commit to branch redo-log
in repository https://gitbox.apache.org/repos/asf/incubator-hudi.git
The following commit(s) were added to refs/heads/redo-log by this push:
new c80a491 [HUDI-462] Redo hudi-timeline-service log statements using
SLF4J (#1184)
c80a491 is described below
commit c80a4911385b2748859c8fc69b6828bd97960b6e
Author: ForwardXu <forwardxu...@gmail.com>
AuthorDate: Mon Jan 6 21:51:48 2020 +0800
[HUDI-462] Redo hudi-timeline-service log statements using SLF4J (#1184)
---
hudi-timeline-service/pom.xml | 5 +++++
.../timeline/service/FileSystemViewHandler.java | 21 +++++++++++----------
.../hudi/timeline/service/TimelineService.java | 8 ++++----
.../view/TestRemoteHoodieTableFileSystemView.java | 8 ++++----
4 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/hudi-timeline-service/pom.xml b/hudi-timeline-service/pom.xml
index 7c7d222..5c8bf9c 100644
--- a/hudi-timeline-service/pom.xml
+++ b/hudi-timeline-service/pom.xml
@@ -80,6 +80,11 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
<!-- Fasterxml -->
<dependency>
diff --git
a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/FileSystemViewHandler.java
b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/FileSystemViewHandler.java
index b202106..d1a6e45 100644
---
a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/FileSystemViewHandler.java
+++
b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/FileSystemViewHandler.java
@@ -39,14 +39,14 @@ import io.javalin.Context;
import io.javalin.Handler;
import io.javalin.Javalin;
import org.apache.hadoop.conf.Configuration;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Main REST Handler class that handles local view staleness and delegates
calls to slice/data-file/timeline handlers.
@@ -54,7 +54,7 @@ import java.util.stream.Collectors;
public class FileSystemViewHandler {
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
- private static final Logger LOG =
LogManager.getLogger(FileSystemViewHandler.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(FileSystemViewHandler.class);
private final FileSystemViewManager viewManager;
private final Javalin app;
@@ -87,8 +87,9 @@ public class FileSystemViewHandler {
HoodieTimeline localTimeline =
viewManager.getFileSystemView(basePath).getTimeline().filterCompletedAndCompactionInstants();
if (LOG.isDebugEnabled()) {
- LOG.debug("Client [ LastTs=" + lastKnownInstantFromClient + ",
TimelineHash=" + timelineHashFromClient
- + "], localTimeline=" +
localTimeline.getInstants().collect(Collectors.toList()));
+ LOG.debug("Client [ LastTs={}, TimelineHash={}], localTimeline={}",
+ lastKnownInstantFromClient, timelineHashFromClient,
+ localTimeline.getInstants().collect(Collectors.toList()));
}
if ((localTimeline.getInstants().count() == 0)
@@ -117,9 +118,9 @@ public class FileSystemViewHandler {
synchronized (view) {
if (isLocalViewBehind(ctx)) {
HoodieTimeline localTimeline =
viewManager.getFileSystemView(basePath).getTimeline();
- LOG.warn("Syncing view as client passed last known instant " +
lastKnownInstantFromClient
- + " as last known instant but server has the folling timeline :"
- + localTimeline.getInstants().collect(Collectors.toList()));
+ LOG.warn(
+ "Syncing view as client passed last known instant {} as last
known instant but server has the folling timeline :{}",
+ lastKnownInstantFromClient,
localTimeline.getInstants().collect(Collectors.toList()));
view.sync();
return true;
}
@@ -134,7 +135,7 @@ public class FileSystemViewHandler {
String result =
prettyPrint ?
OBJECT_MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(obj) :
OBJECT_MAPPER.writeValueAsString(obj);
long endJsonTs = System.currentTimeMillis();
- LOG.debug("Jsonify TimeTaken=" + (endJsonTs - beginJsonTs));
+ LOG.debug("Jsonify TimeTaken={}", (endJsonTs - beginJsonTs));
ctx.result(result);
}
@@ -345,7 +346,7 @@ public class FileSystemViewHandler {
}
} catch (RuntimeException re) {
success = false;
- LOG.error("Got runtime exception servicing request " +
context.queryString(), re);
+ LOG.error("Got runtime exception servicing request {}",
context.queryString(), re);
throw re;
} finally {
long endTs = System.currentTimeMillis();
diff --git
a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/TimelineService.java
b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/TimelineService.java
index 9ea576e..a633a6d 100644
---
a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/TimelineService.java
+++
b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/TimelineService.java
@@ -29,8 +29,8 @@ import com.beust.jcommander.Parameter;
import io.javalin.Javalin;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.Serializable;
@@ -40,7 +40,7 @@ import java.io.Serializable;
*/
public class TimelineService {
- private static final Logger LOG =
LogManager.getLogger(TimelineService.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(TimelineService.class);
private int serverPort;
private Configuration conf;
@@ -106,7 +106,7 @@ public class TimelineService {
app.start(serverPort);
// If port = 0, a dynamic port is assigned. Store it.
serverPort = app.port();
- LOG.info("Starting Timeline server on port :" + serverPort);
+ LOG.info("Starting Timeline server on port :{}", serverPort);
return serverPort;
}
diff --git
a/hudi-timeline-service/src/test/java/org/apache/hudi/timeline/table/view/TestRemoteHoodieTableFileSystemView.java
b/hudi-timeline-service/src/test/java/org/apache/hudi/timeline/table/view/TestRemoteHoodieTableFileSystemView.java
index e01988a..64472ee 100644
---
a/hudi-timeline-service/src/test/java/org/apache/hudi/timeline/table/view/TestRemoteHoodieTableFileSystemView.java
+++
b/hudi-timeline-service/src/test/java/org/apache/hudi/timeline/table/view/TestRemoteHoodieTableFileSystemView.java
@@ -27,16 +27,16 @@ import
org.apache.hudi.common.table.view.FileSystemViewStorageType;
import org.apache.hudi.common.table.view.RemoteHoodieTableFileSystemView;
import org.apache.hudi.common.table.view.TestHoodieTableFileSystemView;
import org.apache.hudi.timeline.service.TimelineService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
/**
* Bring up a remote Timeline Server and run all test-cases of
TestHoodieTableFileSystemView against it.
*/
public class TestRemoteHoodieTableFileSystemView extends
TestHoodieTableFileSystemView {
- private static final Logger LOG =
LogManager.getLogger(TestRemoteHoodieTableFileSystemView.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(TestRemoteHoodieTableFileSystemView.class);
private TimelineService server;
private RemoteHoodieTableFileSystemView view;
@@ -51,7 +51,7 @@ public class TestRemoteHoodieTableFileSystemView extends
TestHoodieTableFileSyst
} catch (Exception ex) {
throw new RuntimeException(ex);
}
- LOG.info("Connecting to Timeline Server :" + server.getServerPort());
+ LOG.info("Connecting to Timeline Server :{}", server.getServerPort());
view = new RemoteHoodieTableFileSystemView("localhost",
server.getServerPort(), metaClient);
return view;
}
