Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Michael Blow has submitted this change and it was merged. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. [NO ISSUE][*DB] LogFlusher fixes Change-Id: I19e150f2560573738938967f389a397ad7150a4d Reviewed-on: https://asterix-gerrit.ics.uci.edu/2106 Tested-by: JenkinsContrib: Jenkins Integration-Tests: Jenkins Reviewed-by: Murtadha Hubail --- M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/ILogBuffer.java A asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/InterruptUtil.java M asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogBuffer.java M asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java 4 files changed, 176 insertions(+), 72 deletions(-) Approvals: Jenkins: Verified; ; Verified Murtadha Hubail: Looks good to me, approved Objections: Jenkins: Violations found diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/ILogBuffer.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/ILogBuffer.java index 8e67603..6bdce73 100644 --- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/ILogBuffer.java +++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/ILogBuffer.java @@ -34,8 +34,9 @@ /** * flush content of buffer to disk + * @param stopping */ -void flush(); +void flush(boolean stopping); /** * @param logSize diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/InterruptUtil.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/InterruptUtil.java new file mode 100644 index 000..4c65c66 --- /dev/null +++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/InterruptUtil.java @@ -0,0 +1,118 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.asterix.common.utils; + +public class InterruptUtil { +/** + * Executes the passed interruptible, retrying if the operation is interrupted. Once the interruptible + * completes, the current thread will be re-interrupted, if the original operation was interrupted. + */ +public static void doUninterruptibly(Interruptible interruptible) { +boolean interrupted = false; +try { +while (true) { +try { +interruptible.run(); +break; +} catch (InterruptedException e) { // NOSONAR- we will re-interrupt the thread during unwind +interrupted = true; +} +} +} finally { +if (interrupted) { +Thread.currentThread().interrupt(); +} +} +} + +/** + * Executes the passed interruptible, retrying if the operation is interrupted. Once the interruptible + * completes, the current thread will be re-interrupted, if the original operation was interrupted. + */ +public static void doExUninterruptibly(ThrowingInterruptible interruptible) throws Exception { +boolean interrupted = false; +try { +while (true) { +try { +interruptible.run(); +break; +} catch (InterruptedException e) { // NOSONAR- we will re-interrupt the thread during unwind +interrupted = true; +} +} +} finally { +if (interrupted) { +Thread.currentThread().interrupt(); +} +} +} + +/** + * Executes the passed interruptible, retrying if the operation is interrupted. + * + * @return true if the original operation was interrupted, otherwise false + */ +public static boolean doUninterruptiblyGet(Interruptible interruptible) { +boolean
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Murtadha Hubail has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 2: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-Reviewer: Murtadha Hubail Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 2: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/4382/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 2: Contrib+1 BAD Compatibility Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/2017/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 2: BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/2017/ -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 2: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/4382/ -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/1333/ (10/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/1999/ (6/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/1938/ (8/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/1323/ (3/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app/2218/ (4/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/6875/ (7/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/2106 to look at the new patch set (#2). Change subject: [NO ISSUE][*DB] LogFlusher fixes .. [NO ISSUE][*DB] LogFlusher fixes Change-Id: I19e150f2560573738938967f389a397ad7150a4d --- M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/ILogBuffer.java A asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/InterruptUtil.java M asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogBuffer.java M asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java 4 files changed, 176 insertions(+), 72 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/06/2106/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/5379/ (9/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/1331/ (5/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/2031/ (2/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/1659/ (1/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 1: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/4380/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/1332/ (10/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/4380/ -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/2029/ (10/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app/2216/ (9/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/1329/ (4/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/6873/ (5/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/1321/ (2/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/1330/ (1/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/1936/ (6/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/5377/ (3/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/1657/ (8/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Michael Blow has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/2106 Change subject: [NO ISSUE][*DB] LogFlusher fixes .. [NO ISSUE][*DB] LogFlusher fixes Change-Id: I19e150f2560573738938967f389a397ad7150a4d --- M asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogBuffer.java M asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java 2 files changed, 61 insertions(+), 60 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/06/2106/1 diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogBuffer.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogBuffer.java index 081cf02..fa5e1bd 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogBuffer.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogBuffer.java @@ -105,15 +105,15 @@ if (logRecord.getLogType() == LogType.JOB_COMMIT || logRecord.getLogType() == LogType.ABORT || logRecord.getLogType() == LogType.WAIT) { logRecord.isFlushed(false); -syncCommitQ.offer(logRecord); +syncCommitQ.add(logRecord); } if (logRecord.getLogType() == LogType.FLUSH) { logRecord.isFlushed(false); -flushQ.offer(logRecord); +flushQ.add(logRecord); } } else if (logRecord.getLogSource() == LogSource.REMOTE && (logRecord.getLogType() == LogType.JOB_COMMIT || logRecord.getLogType() == LogType.ABORT)) { -remoteJobsQ.offer(logRecord); +remoteJobsQ.add(logRecord); } this.notify(); } @@ -169,12 +169,13 @@ @Override public void flush() { +boolean interrupted = false; try { int endOffset; while (!full.get()) { -synchronized (this) { -if (appendOffset - flushOffset == 0 && !full.get()) { -try { +try { +synchronized (this) { +if (appendOffset - flushOffset == 0 && !full.get()) { if (IS_DEBUG_MODE) { LOGGER.info("flush()| appendOffset: " + appendOffset + ", flushOffset: " + flushOffset + ", full: " + full.get()); @@ -183,14 +184,14 @@ fileChannel.close(); return; } -this.wait(); -} catch (InterruptedException e) { -continue; +wait(); } +endOffset = appendOffset; } -endOffset = appendOffset; -} internalFlush(flushOffset, endOffset); +} catch (InterruptedException e) { +interrupted = true; +} } internalFlush(flushOffset, appendOffset); if (isLastPage) { @@ -198,6 +199,10 @@ } } catch (IOException e) { throw new IllegalStateException(e); +} finally { +if (interrupted) { +Thread.currentThread().interrupt(); +} } } @@ -230,7 +235,7 @@ if (endOffset > beginOffset) { logBufferTailReader.initializeScan(beginOffset, endOffset); -ITransactionContext txnCtx = null; +ITransactionContext txnCtx; LogRecord logRecord = logBufferTailReader.next(); while (logRecord != null) { @@ -327,8 +332,9 @@ } @Override -public void stop() { -this.stop = true; +public synchronized void stop() { +stop = true; +notifyAll(); } @Override diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java index e5e91e8..1f45103 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java @@ -33,6 +33,7 @@ import
Change in asterixdb[master]: [NO ISSUE][*DB] LogFlusher fixes
Jenkins has posted comments on this change. Change subject: [NO ISSUE][*DB] LogFlusher fixes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/1997/ (7/10) -- To view, visit https://asterix-gerrit.ics.uci.edu/2106 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e150f2560573738938967f389a397ad7150a4d Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-HasComments: No