You are viewing a plain text version of this content. The canonical link for it is here.

Posted to notifications@asterixdb.apache.org by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org> on 2016/07/27 19:00:40 UTC

Change in asterixdb[master]: ASTERIXDB-1553: Create ClusterControllerService Dir/File Cre...

Michael Blow has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/1029

Change subject: ASTERIXDB-1553: Create ClusterControllerService Dir/File Creation
......................................................................

ASTERIXDB-1553: Create ClusterControllerService Dir/File Creation

Change-Id: Ie2e65cf083b3eb2db3e716f2b34fb28fe01debca
---
M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/logs/LogFile.java
1 file changed, 11 insertions(+), 6 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/29/1029/1

diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/logs/LogFile.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/logs/LogFile.java
index 7eb0674..d3fa282 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/logs/LogFile.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/logs/LogFile.java
@@ -27,6 +27,7 @@
 public class LogFile {
     private final File root;
 
+    private long openTime;
     private PrintWriter out;
 
     public LogFile(File root) {
@@ -34,18 +35,22 @@
     }
 
     public void open() throws Exception {
-        root.mkdirs();
-        out = new PrintWriter(new FileOutputStream(new File(root, String.valueOf(System.currentTimeMillis()) + ".log"),
-                true));
+        openTime = System.currentTimeMillis();
     }
 
-    public void log(JSONObject object) throws Exception {
+    public synchronized void log(JSONObject object) throws Exception {
+        if (out == null) {
+            root.mkdirs();
+            out = new PrintWriter(new FileOutputStream(new File(root, openTime + ".log"), true));
+        }
         out.println(object.toString(1));
         out.flush();
     }
 
     public void close() {
-        out.flush();
-        out.close();
+        if (out != null) {
+            out.flush();
+            out.close();
+        }
     }
 }

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1029
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2e65cf083b3eb2db3e716f2b34fb28fe01debca
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>

Change in asterixdb[master]: ASTERIXDB-1553: ClusterControllerService Dir/File Creation O...

Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.

Jenkins has posted comments on this change.

Change subject: ASTERIXDB-1553: ClusterControllerService Dir/File Creation On-Demand
......................................................................


Patch Set 2:

Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/2033/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1029
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ie2e65cf083b3eb2db3e716f2b34fb28fe01debca
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No

Change in asterixdb[master]: ASTERIXDB-1553: ClusterControllerService Dir/File Creation O...

Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.

Jenkins has posted comments on this change.

Change subject: ASTERIXDB-1553: ClusterControllerService Dir/File Creation On-Demand
......................................................................


Patch Set 2:

Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/184/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1029
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ie2e65cf083b3eb2db3e716f2b34fb28fe01debca
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No

Change in asterixdb[master]: ASTERIXDB-1553: ClusterControllerService Dir/File Creation O...

Posted by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org>.

Michael Blow has submitted this change and it was merged.

Change subject: ASTERIXDB-1553: ClusterControllerService Dir/File Creation On-Demand
......................................................................


ASTERIXDB-1553: ClusterControllerService Dir/File Creation On-Demand

Change-Id: Ie2e65cf083b3eb2db3e716f2b34fb28fe01debca
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1029
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <ti...@apache.org>
---
M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/logs/LogFile.java
1 file changed, 13 insertions(+), 7 deletions(-)

Approvals:
  Till Westmann: Looks good to me, approved
  Jenkins: Verified

Objections:
  Jenkins: Violations found



diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/logs/LogFile.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/logs/LogFile.java
index 7eb0674..8f95c35 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/logs/LogFile.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/logs/LogFile.java
@@ -27,6 +27,7 @@
 public class LogFile {
     private final File root;
 
+    private long openTime;
     private PrintWriter out;
 
     public LogFile(File root) {
@@ -34,18 +35,23 @@
     }
 
     public void open() throws Exception {
-        root.mkdirs();
-        out = new PrintWriter(new FileOutputStream(new File(root, String.valueOf(System.currentTimeMillis()) + ".log"),
-                true));
+        openTime = System.currentTimeMillis();
     }
 
-    public void log(JSONObject object) throws Exception {
+    public synchronized void log(JSONObject object) throws Exception {
+        if (out == null) {
+            root.mkdirs();
+            out = new PrintWriter(new FileOutputStream(new File(root, openTime + ".log"), true));
+        }
         out.println(object.toString(1));
         out.flush();
     }
 
-    public void close() {
-        out.flush();
-        out.close();
+    public synchronized void close() {
+        if (out != null) {
+            out.flush();
+            out.close();
+            out = null;
+        }
     }
 }

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1029
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2e65cf083b3eb2db3e716f2b34fb28fe01debca
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>

Change in asterixdb[master]: ASTERIXDB-1553: ClusterControllerService Dir/File Creation O...

Posted by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org>.

Michael Blow has uploaded a new patch set (#2).

Change subject: ASTERIXDB-1553: ClusterControllerService Dir/File Creation On-Demand
......................................................................

ASTERIXDB-1553: ClusterControllerService Dir/File Creation On-Demand

Change-Id: Ie2e65cf083b3eb2db3e716f2b34fb28fe01debca
---
M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/logs/LogFile.java
1 file changed, 11 insertions(+), 6 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/29/1029/2
-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1029
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ie2e65cf083b3eb2db3e716f2b34fb28fe01debca
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>

Change in asterixdb[master]: ASTERIXDB-1553: ClusterControllerService Dir/File Creation O...

Posted by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org>.

Till Westmann has posted comments on this change.

Change subject: ASTERIXDB-1553: ClusterControllerService Dir/File Creation On-Demand
......................................................................


Patch Set 2:

(1 comment)

https://asterix-gerrit.ics.uci.edu/#/c/1029/2/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/logs/LogFile.java
File hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/logs/LogFile.java:

Line 50:     public void close() {
synchronize close() as well and set out to null after closing?


-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1029
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ie2e65cf083b3eb2db3e716f2b34fb28fe01debca
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: Yes

Change in asterixdb[master]: ASTERIXDB-1553: ClusterControllerService Dir/File Creation O...

Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.

Jenkins has posted comments on this change.

Change subject: ASTERIXDB-1553: ClusterControllerService Dir/File Creation On-Demand
......................................................................


Patch Set 3:

Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/189/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1029
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ie2e65cf083b3eb2db3e716f2b34fb28fe01debca
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No