[05/51] [abbrv] hadoop git commit: YARN-5199. Close LogReader in in AHSWebServices#getStreamingOutput and FileInputStream in NMWebServices#getLogs. Contributed by Xuan Gong

2016-06-13 Thread vvasudev 
YARN-5199. Close LogReader in in AHSWebServices#getStreamingOutput and
FileInputStream in NMWebServices#getLogs. Contributed by Xuan Gong


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/58be55b6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/58be55b6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/58be55b6

Branch: refs/heads/YARN-3926
Commit: 58be55b6e07b94aa55ed87c461f3e5c04cc61630
Parents: 8554aee1b
Author: Xuan 
Authored: Tue Jun 7 16:07:02 2016 -0700
Committer: Xuan 
Committed: Tue Jun 7 16:07:02 2016 -0700

--
 .../webapp/AHSWebServices.java  | 155 ++-
 .../nodemanager/webapp/NMWebServices.java   |  71 +
 2 files changed, 118 insertions(+), 108 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/58be55b6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
index d91ae55..59dbd44 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
@@ -40,7 +40,6 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.StreamingOutput;
 import javax.ws.rs.core.Response.ResponseBuilder;
 import javax.ws.rs.core.Response.Status;
-
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
@@ -363,86 +362,94 @@ public class AHSWebServices extends WebServices {
   if ((nodeId == null || nodeName.contains(LogAggregationUtils
   .getNodeString(nodeId))) && !nodeName.endsWith(
   LogAggregationUtils.TMP_FILE_SUFFIX)) {
-AggregatedLogFormat.LogReader reader =
-new AggregatedLogFormat.LogReader(conf,
-thisNodeFile.getPath());
-DataInputStream valueStream;
-LogKey key = new LogKey();
-valueStream = reader.next(key);
-while (valueStream != null && !key.toString()
-.equals(containerIdStr)) {
-  // Next container
-  key = new LogKey();
+AggregatedLogFormat.LogReader reader = null;
+try {
+  reader = new AggregatedLogFormat.LogReader(conf,
+  thisNodeFile.getPath());
+  DataInputStream valueStream;
+  LogKey key = new LogKey();
   valueStream = reader.next(key);
-}
-if (valueStream == null) {
-  continue;
-}
-while (true) {
-  try {
-String fileType = valueStream.readUTF();
-String fileLengthStr = valueStream.readUTF();
-long fileLength = Long.parseLong(fileLengthStr);
-if (fileType.equalsIgnoreCase(logFile)) {
-  StringBuilder sb = new StringBuilder();
-  sb.append("LogType:");
-  sb.append(fileType + "\n");
-  sb.append("Log Upload Time:");
-  sb.append(Times.format(System.currentTimeMillis()) + "\n");
-  sb.append("LogLength:");
-  sb.append(fileLengthStr + "\n");
-  sb.append("Log Contents:\n");
-  byte[] b = sb.toString().getBytes(Charset.forName("UTF-8"));
-  os.write(b, 0, b.length);
-
-  long toSkip = 0;
-  long totalBytesToRead = fileLength;
-  if (bytes < 0) {
-long absBytes = Math.abs(bytes);
-if (absBytes < fileLength) {
-  toSkip = fileLength - absBytes;
-  totalBytesToRead = absBytes;
+  while (valueStream != null && !key.toString()
+  .equals(containerIdStr)) {
+// Next container
+key = new

[32/50] [abbrv] hadoop git commit: YARN-5199. Close LogReader in in AHSWebServices#getStreamingOutput and FileInputStream in NMWebServices#getLogs. Contributed by Xuan Gong

2016-06-09 Thread aengineer 
YARN-5199. Close LogReader in in AHSWebServices#getStreamingOutput and
FileInputStream in NMWebServices#getLogs. Contributed by Xuan Gong


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/58be55b6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/58be55b6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/58be55b6

Branch: refs/heads/HDFS-7240
Commit: 58be55b6e07b94aa55ed87c461f3e5c04cc61630
Parents: 8554aee1b
Author: Xuan 
Authored: Tue Jun 7 16:07:02 2016 -0700
Committer: Xuan 
Committed: Tue Jun 7 16:07:02 2016 -0700

--
 .../webapp/AHSWebServices.java  | 155 ++-
 .../nodemanager/webapp/NMWebServices.java   |  71 +
 2 files changed, 118 insertions(+), 108 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/58be55b6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
index d91ae55..59dbd44 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
@@ -40,7 +40,6 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.StreamingOutput;
 import javax.ws.rs.core.Response.ResponseBuilder;
 import javax.ws.rs.core.Response.Status;
-
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
@@ -363,86 +362,94 @@ public class AHSWebServices extends WebServices {
   if ((nodeId == null || nodeName.contains(LogAggregationUtils
   .getNodeString(nodeId))) && !nodeName.endsWith(
   LogAggregationUtils.TMP_FILE_SUFFIX)) {
-AggregatedLogFormat.LogReader reader =
-new AggregatedLogFormat.LogReader(conf,
-thisNodeFile.getPath());
-DataInputStream valueStream;
-LogKey key = new LogKey();
-valueStream = reader.next(key);
-while (valueStream != null && !key.toString()
-.equals(containerIdStr)) {
-  // Next container
-  key = new LogKey();
+AggregatedLogFormat.LogReader reader = null;
+try {
+  reader = new AggregatedLogFormat.LogReader(conf,
+  thisNodeFile.getPath());
+  DataInputStream valueStream;
+  LogKey key = new LogKey();
   valueStream = reader.next(key);
-}
-if (valueStream == null) {
-  continue;
-}
-while (true) {
-  try {
-String fileType = valueStream.readUTF();
-String fileLengthStr = valueStream.readUTF();
-long fileLength = Long.parseLong(fileLengthStr);
-if (fileType.equalsIgnoreCase(logFile)) {
-  StringBuilder sb = new StringBuilder();
-  sb.append("LogType:");
-  sb.append(fileType + "\n");
-  sb.append("Log Upload Time:");
-  sb.append(Times.format(System.currentTimeMillis()) + "\n");
-  sb.append("LogLength:");
-  sb.append(fileLengthStr + "\n");
-  sb.append("Log Contents:\n");
-  byte[] b = sb.toString().getBytes(Charset.forName("UTF-8"));
-  os.write(b, 0, b.length);
-
-  long toSkip = 0;
-  long totalBytesToRead = fileLength;
-  if (bytes < 0) {
-long absBytes = Math.abs(bytes);
-if (absBytes < fileLength) {
-  toSkip = fileLength - absBytes;
-  totalBytesToRead = absBytes;
+  while (valueStream != null && !key.toString()
+  .equals(containerIdStr)) {
+// Next container
+key = new

[06/24] hadoop git commit: YARN-5199. Close LogReader in in AHSWebServices#getStreamingOutput and FileInputStream in NMWebServices#getLogs. Contributed by Xuan Gong

2016-06-09 Thread aengineer 
YARN-5199. Close LogReader in in AHSWebServices#getStreamingOutput and
FileInputStream in NMWebServices#getLogs. Contributed by Xuan Gong


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/58be55b6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/58be55b6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/58be55b6

Branch: refs/heads/HDFS-1312
Commit: 58be55b6e07b94aa55ed87c461f3e5c04cc61630
Parents: 8554aee1b
Author: Xuan 
Authored: Tue Jun 7 16:07:02 2016 -0700
Committer: Xuan 
Committed: Tue Jun 7 16:07:02 2016 -0700

--
 .../webapp/AHSWebServices.java  | 155 ++-
 .../nodemanager/webapp/NMWebServices.java   |  71 +
 2 files changed, 118 insertions(+), 108 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/58be55b6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
index d91ae55..59dbd44 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
@@ -40,7 +40,6 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.StreamingOutput;
 import javax.ws.rs.core.Response.ResponseBuilder;
 import javax.ws.rs.core.Response.Status;
-
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
@@ -363,86 +362,94 @@ public class AHSWebServices extends WebServices {
   if ((nodeId == null || nodeName.contains(LogAggregationUtils
   .getNodeString(nodeId))) && !nodeName.endsWith(
   LogAggregationUtils.TMP_FILE_SUFFIX)) {
-AggregatedLogFormat.LogReader reader =
-new AggregatedLogFormat.LogReader(conf,
-thisNodeFile.getPath());
-DataInputStream valueStream;
-LogKey key = new LogKey();
-valueStream = reader.next(key);
-while (valueStream != null && !key.toString()
-.equals(containerIdStr)) {
-  // Next container
-  key = new LogKey();
+AggregatedLogFormat.LogReader reader = null;
+try {
+  reader = new AggregatedLogFormat.LogReader(conf,
+  thisNodeFile.getPath());
+  DataInputStream valueStream;
+  LogKey key = new LogKey();
   valueStream = reader.next(key);
-}
-if (valueStream == null) {
-  continue;
-}
-while (true) {
-  try {
-String fileType = valueStream.readUTF();
-String fileLengthStr = valueStream.readUTF();
-long fileLength = Long.parseLong(fileLengthStr);
-if (fileType.equalsIgnoreCase(logFile)) {
-  StringBuilder sb = new StringBuilder();
-  sb.append("LogType:");
-  sb.append(fileType + "\n");
-  sb.append("Log Upload Time:");
-  sb.append(Times.format(System.currentTimeMillis()) + "\n");
-  sb.append("LogLength:");
-  sb.append(fileLengthStr + "\n");
-  sb.append("Log Contents:\n");
-  byte[] b = sb.toString().getBytes(Charset.forName("UTF-8"));
-  os.write(b, 0, b.length);
-
-  long toSkip = 0;
-  long totalBytesToRead = fileLength;
-  if (bytes < 0) {
-long absBytes = Math.abs(bytes);
-if (absBytes < fileLength) {
-  toSkip = fileLength - absBytes;
-  totalBytesToRead = absBytes;
+  while (valueStream != null && !key.toString()
+  .equals(containerIdStr)) {
+// Next container
+key = new

hadoop git commit: YARN-5199. Close LogReader in in AHSWebServices#getStreamingOutput and FileInputStream in NMWebServices#getLogs. Contributed by Xuan Gong

2016-06-07 Thread xgong 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 6a9f38eba -> 10f0c0475


YARN-5199. Close LogReader in in AHSWebServices#getStreamingOutput and
FileInputStream in NMWebServices#getLogs. Contributed by Xuan Gong

(cherry picked from commit 58be55b6e07b94aa55ed87c461f3e5c04cc61630)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/10f0c047
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/10f0c047
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/10f0c047

Branch: refs/heads/branch-2
Commit: 10f0c0475e5b66e5ac33ab05d831d45d136996e5
Parents: 6a9f38e
Author: Xuan 
Authored: Tue Jun 7 16:07:02 2016 -0700
Committer: Xuan 
Committed: Tue Jun 7 16:08:54 2016 -0700

--
 .../webapp/AHSWebServices.java  | 155 ++-
 .../nodemanager/webapp/NMWebServices.java   |  71 +
 2 files changed, 118 insertions(+), 108 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/10f0c047/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
index d91ae55..59dbd44 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
@@ -40,7 +40,6 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.StreamingOutput;
 import javax.ws.rs.core.Response.ResponseBuilder;
 import javax.ws.rs.core.Response.Status;
-
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
@@ -363,86 +362,94 @@ public class AHSWebServices extends WebServices {
   if ((nodeId == null || nodeName.contains(LogAggregationUtils
   .getNodeString(nodeId))) && !nodeName.endsWith(
   LogAggregationUtils.TMP_FILE_SUFFIX)) {
-AggregatedLogFormat.LogReader reader =
-new AggregatedLogFormat.LogReader(conf,
-thisNodeFile.getPath());
-DataInputStream valueStream;
-LogKey key = new LogKey();
-valueStream = reader.next(key);
-while (valueStream != null && !key.toString()
-.equals(containerIdStr)) {
-  // Next container
-  key = new LogKey();
+AggregatedLogFormat.LogReader reader = null;
+try {
+  reader = new AggregatedLogFormat.LogReader(conf,
+  thisNodeFile.getPath());
+  DataInputStream valueStream;
+  LogKey key = new LogKey();
   valueStream = reader.next(key);
-}
-if (valueStream == null) {
-  continue;
-}
-while (true) {
-  try {
-String fileType = valueStream.readUTF();
-String fileLengthStr = valueStream.readUTF();
-long fileLength = Long.parseLong(fileLengthStr);
-if (fileType.equalsIgnoreCase(logFile)) {
-  StringBuilder sb = new StringBuilder();
-  sb.append("LogType:");
-  sb.append(fileType + "\n");
-  sb.append("Log Upload Time:");
-  sb.append(Times.format(System.currentTimeMillis()) + "\n");
-  sb.append("LogLength:");
-  sb.append(fileLengthStr + "\n");
-  sb.append("Log Contents:\n");
-  byte[] b = sb.toString().getBytes(Charset.forName("UTF-8"));
-  os.write(b, 0, b.length);
-
-  long toSkip = 0;
-  long totalBytesToRead = fileLength;
-  if (bytes < 0) {
-long absBytes = Math.abs(bytes);
-if (absBytes < fileLength) {
-  toSkip = fileLength - absBytes;
-  totalBytesToRead = absBytes;
+  while

hadoop git commit: YARN-5199. Close LogReader in in AHSWebServices#getStreamingOutput and FileInputStream in NMWebServices#getLogs. Contributed by Xuan Gong

2016-06-07 Thread xgong 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 8554aee1b -> 58be55b6e


YARN-5199. Close LogReader in in AHSWebServices#getStreamingOutput and
FileInputStream in NMWebServices#getLogs. Contributed by Xuan Gong


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/58be55b6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/58be55b6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/58be55b6

Branch: refs/heads/trunk
Commit: 58be55b6e07b94aa55ed87c461f3e5c04cc61630
Parents: 8554aee1b
Author: Xuan 
Authored: Tue Jun 7 16:07:02 2016 -0700
Committer: Xuan 
Committed: Tue Jun 7 16:07:02 2016 -0700

--
 .../webapp/AHSWebServices.java  | 155 ++-
 .../nodemanager/webapp/NMWebServices.java   |  71 +
 2 files changed, 118 insertions(+), 108 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/58be55b6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
index d91ae55..59dbd44 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
@@ -40,7 +40,6 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.StreamingOutput;
 import javax.ws.rs.core.Response.ResponseBuilder;
 import javax.ws.rs.core.Response.Status;
-
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
@@ -363,86 +362,94 @@ public class AHSWebServices extends WebServices {
   if ((nodeId == null || nodeName.contains(LogAggregationUtils
   .getNodeString(nodeId))) && !nodeName.endsWith(
   LogAggregationUtils.TMP_FILE_SUFFIX)) {
-AggregatedLogFormat.LogReader reader =
-new AggregatedLogFormat.LogReader(conf,
-thisNodeFile.getPath());
-DataInputStream valueStream;
-LogKey key = new LogKey();
-valueStream = reader.next(key);
-while (valueStream != null && !key.toString()
-.equals(containerIdStr)) {
-  // Next container
-  key = new LogKey();
+AggregatedLogFormat.LogReader reader = null;
+try {
+  reader = new AggregatedLogFormat.LogReader(conf,
+  thisNodeFile.getPath());
+  DataInputStream valueStream;
+  LogKey key = new LogKey();
   valueStream = reader.next(key);
-}
-if (valueStream == null) {
-  continue;
-}
-while (true) {
-  try {
-String fileType = valueStream.readUTF();
-String fileLengthStr = valueStream.readUTF();
-long fileLength = Long.parseLong(fileLengthStr);
-if (fileType.equalsIgnoreCase(logFile)) {
-  StringBuilder sb = new StringBuilder();
-  sb.append("LogType:");
-  sb.append(fileType + "\n");
-  sb.append("Log Upload Time:");
-  sb.append(Times.format(System.currentTimeMillis()) + "\n");
-  sb.append("LogLength:");
-  sb.append(fileLengthStr + "\n");
-  sb.append("Log Contents:\n");
-  byte[] b = sb.toString().getBytes(Charset.forName("UTF-8"));
-  os.write(b, 0, b.length);
-
-  long toSkip = 0;
-  long totalBytesToRead = fileLength;
-  if (bytes < 0) {
-long absBytes = Math.abs(bytes);
-if (absBytes < fileLength) {
-  toSkip = fileLength - absBytes;
-  totalBytesToRead = absBytes;
+  while (valueStream != null && !key.toString()
+