Change in asterixdb[master]: Add test cases for alive feed check when connect/disconnect
Xikui Wang has submitted this change and it was merged. Change subject: Add test cases for alive feed check when connect/disconnect .. Add test cases for alive feed check when connect/disconnect `connect feed' and `disconnect feed` are not allowed when feed is alive. Add two test cases to check both exceptions. Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec Reviewed-on: https://asterix-gerrit.ics.uci.edu/1664 Sonar-Qube: JenkinsTested-by: Jenkins Integration-Tests: Jenkins Reviewed-by: Steven Jacobs --- M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/connect-live-feed/connect-live-feed.0.ddl.aql A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/connect-live-feed/connect-live-feed.1.update.aql A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/connect-live-feed/connect-live-feed.2.sleep.aql A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/connect-live-feed/connect-live-feed.3.update.aql A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/disconnect-live-feed/disconnect-live-feed.0.ddl.aql A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/disconnect-live-feed/disconnect-live-feed.1.update.aql A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/disconnect-live-feed/disconnect-live-feed.2.sleep.aql A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/disconnect-live-feed/disconnect-live-feed.3.update.aql M asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java M asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties 12 files changed, 228 insertions(+), 2 deletions(-) Approvals: Steven Jacobs: Looks good to me, approved Jenkins: Verified; No violations found; Verified diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java index 88d07e4..cb59f5c 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java @@ -60,6 +60,7 @@ import org.apache.asterix.common.context.IStorageComponentProvider; import org.apache.asterix.common.exceptions.ACIDException; import org.apache.asterix.common.exceptions.CompilationException; +import org.apache.asterix.common.exceptions.ErrorCode; import org.apache.asterix.common.functions.FunctionSignature; import org.apache.asterix.common.metadata.IDataset; import org.apache.asterix.common.utils.JobUtils; @@ -2104,6 +2105,11 @@ String policyName = cfs.getPolicy(); MetadataTransactionContext mdTxnCtx = MetadataManager.INSTANCE.beginTransaction(); metadataProvider.setMetadataTxnContext(mdTxnCtx); +// Check whether feed is alive +if (ActiveJobNotificationHandler.INSTANCE +.getActiveEntityListener(new EntityId(Feed.EXTENSION_NAME, dataverseName, feedName)) != null) { +throw new CompilationException(ErrorCode.FEED_CHANGE_FEED_CONNECTIVITY_ON_ALIVE_FEED, feedName); +} // Transaction handling MetadataLockManager.INSTANCE.connectFeedBegin(metadataProvider.getLocks(), dataverseName, dataverseName + "." + datasetName, dataverseName + "." + feedName); @@ -2139,6 +2145,11 @@ String feedName = cfs.getFeedName().getValue(); MetadataTransactionContext mdTxnCtx = MetadataManager.INSTANCE.beginTransaction(); metadataProvider.setMetadataTxnContext(mdTxnCtx); +// Check whether feed is alive +if (ActiveJobNotificationHandler.INSTANCE +.getActiveEntityListener(new EntityId(Feed.EXTENSION_NAME, dataverseName, feedName)) != null) { +throw new CompilationException(ErrorCode.FEED_CHANGE_FEED_CONNECTIVITY_ON_ALIVE_FEED, feedName); +} MetadataLockManager.INSTANCE.disconnectFeedBegin(metadataProvider.getLocks(), dataverseName, dataverseName + "." + datasetName, dataverseName + "." + cfs.getFeedName()); try { diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/connect-live-feed/connect-live-feed.0.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/connect-live-feed/connect-live-feed.0.ddl.aql new file mode 100644 index 000..47bee4d --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/connect-live-feed/connect-live-feed.0.ddl.aql @@ -0,0 +1,40 @@
Change in asterixdb[master]: Add test cases for alive feed check when connect/disconnect
Steven Jacobs has posted comments on this change. Change subject: Add test cases for alive feed check when connect/disconnect .. Patch Set 2: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1664 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Steven Jacobs Gerrit-Reviewer: Xikui Wang Gerrit-HasComments: No
Change in asterixdb[master]: Add test cases for alive feed check when connect/disconnect
Ian Maxon has posted comments on this change. Change subject: Add test cases for alive feed check when connect/disconnect .. Patch Set 2: im not sure what it is either but it was enough to stall the docker daemon -- To view, visit https://asterix-gerrit.ics.uci.edu/1664 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Steven Jacobs Gerrit-Reviewer: Xikui Wang Gerrit-HasComments: No
Change in asterixdb[master]: Add test cases for alive feed check when connect/disconnect
Xikui Wang has posted comments on this change. Change subject: Add test cases for alive feed check when connect/disconnect .. Patch Set 2: It seems we are breaking BAD right now... Not sure whether that's expected. Added Steven to the reviewer list. -- To view, visit https://asterix-gerrit.ics.uci.edu/1664 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Xikui Wang Gerrit-HasComments: No
Change in asterixdb[master]: Add test cases for alive feed check when connect/disconnect
Ian Maxon has posted comments on this change. Change subject: Add test cases for alive feed check when connect/disconnect .. Patch Set 2: here: https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/985/console or perhaps it is bad specific? -- To view, visit https://asterix-gerrit.ics.uci.edu/1664 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Xikui Wang Gerrit-HasComments: No
Change in asterixdb[master]: Add test cases for alive feed check when connect/disconnect
Xikui Wang has posted comments on this change. Change subject: Add test cases for alive feed check when connect/disconnect .. Patch Set 2: @Ian, Sorry that I missed it. Where is the OOM exactly? -- To view, visit https://asterix-gerrit.ics.uci.edu/1664 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Xikui Wang Gerrit-HasComments: No
Change in asterixdb[master]: Add test cases for alive feed check when connect/disconnect
Ian Maxon has posted comments on this change. Change subject: Add test cases for alive feed check when connect/disconnect .. Patch Set 2: These seem to cause OOM in their containers -- To view, visit https://asterix-gerrit.ics.uci.edu/1664 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Add test cases for alive feed check when connect/disconnect
Jenkins has posted comments on this change. Change subject: Add test cases for alive feed check when connect/disconnect .. Patch Set 2: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/2456/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/1664 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Add test cases for alive feed check when connect/disconnect
Jenkins has posted comments on this change. Change subject: Add test cases for alive feed check when connect/disconnect .. Patch Set 2: BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/985/ -- To view, visit https://asterix-gerrit.ics.uci.edu/1664 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Add test cases for alive feed check when connect/disconnect
Jenkins has posted comments on this change. Change subject: Add test cases for alive feed check when connect/disconnect .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/19/ (6/6) -- To view, visit https://asterix-gerrit.ics.uci.edu/1664 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Add test cases for alive feed check when connect/disconnect
Jenkins has posted comments on this change. Change subject: Add test cases for alive feed check when connect/disconnect .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app/278/ (3/6) -- To view, visit https://asterix-gerrit.ics.uci.edu/1664 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Add test cases for alive feed check when connect/disconnect
Jenkins has posted comments on this change. Change subject: Add test cases for alive feed check when connect/disconnect .. Patch Set 2: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/2456/ -- To view, visit https://asterix-gerrit.ics.uci.edu/1664 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Add test cases for alive feed check when connect/disconnect
Jenkins has posted comments on this change. Change subject: Add test cases for alive feed check when connect/disconnect .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/94/ (2/6) -- To view, visit https://asterix-gerrit.ics.uci.edu/1664 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Add test cases for alive feed check when connect/disconnect
Xikui Wang has uploaded a new patch set (#2). Change subject: Add test cases for alive feed check when connect/disconnect .. Add test cases for alive feed check when connect/disconnect `connect feed' and `disconnect feed` are not allowed when feed is alive. Add two test cases to check both exceptions. Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec --- M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/connect-live-feed/connect-live-feed.0.ddl.aql A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/connect-live-feed/connect-live-feed.1.update.aql A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/connect-live-feed/connect-live-feed.2.sleep.aql A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/connect-live-feed/connect-live-feed.3.update.aql A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/disconnect-live-feed/disconnect-live-feed.0.ddl.aql A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/disconnect-live-feed/disconnect-live-feed.1.update.aql A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/disconnect-live-feed/disconnect-live-feed.2.sleep.aql A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/disconnect-live-feed/disconnect-live-feed.3.update.aql M asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java M asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties 12 files changed, 228 insertions(+), 2 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/64/1664/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1664 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Jenkins
Change in asterixdb[master]: Add test cases for alive feed check when connect/disconnect
Jenkins has posted comments on this change. Change subject: Add test cases for alive feed check when connect/disconnect .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/97/ (1/6) -- To view, visit https://asterix-gerrit.ics.uci.edu/1664 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Add test cases for alive feed check when connect/disconnect
Jenkins has posted comments on this change. Change subject: Add test cases for alive feed check when connect/disconnect .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/17/ (6/6) -- To view, visit https://asterix-gerrit.ics.uci.edu/1664 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Add test cases for alive feed check when connect/disconnect
Jenkins has posted comments on this change. Change subject: Add test cases for alive feed check when connect/disconnect .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app/276/ (5/6) -- To view, visit https://asterix-gerrit.ics.uci.edu/1664 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Add test cases for alive feed check when connect/disconnect
Jenkins has posted comments on this change. Change subject: Add test cases for alive feed check when connect/disconnect .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/2454/ -- To view, visit https://asterix-gerrit.ics.uci.edu/1664 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Add test cases for alive feed check when connect/disconnect
Jenkins has posted comments on this change. Change subject: Add test cases for alive feed check when connect/disconnect .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/3491/ (2/6) -- To view, visit https://asterix-gerrit.ics.uci.edu/1664 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Add test cases for alive feed check when connect/disconnect
Jenkins has posted comments on this change. Change subject: Add test cases for alive feed check when connect/disconnect .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/4955/ (3/6) -- To view, visit https://asterix-gerrit.ics.uci.edu/1664 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Add test cases for alive feed check when connect/disconnect
Jenkins has posted comments on this change. Change subject: Add test cases for alive feed check when connect/disconnect .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/92/ (4/6) -- To view, visit https://asterix-gerrit.ics.uci.edu/1664 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Add test cases for alive feed check when connect/disconnect
Xikui Wang has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/1664 Change subject: Add test cases for alive feed check when connect/disconnect .. Add test cases for alive feed check when connect/disconnect `connect feed' and `disconnect feed` are not allowed when feed is alive. Add two test case to check both exceptions. Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec --- M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/connect-live-feed/connect-live-feed.0.ddl.aql A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/connect-live-feed/connect-live-feed.1.update.aql A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/connect-live-feed/connect-live-feed.2.sleep.aql A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/connect-live-feed/connect-live-feed.3.update.aql A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/disconnect-live-feed/disconnect-live-feed.0.ddl.aql A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/disconnect-live-feed/disconnect-live-feed.1.update.aql A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/disconnect-live-feed/disconnect-live-feed.2.sleep.aql A asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/disconnect-live-feed/disconnect-live-feed.3.update.aql M asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java M asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties 12 files changed, 228 insertions(+), 2 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/64/1664/1 diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java index 88d07e4..cb59f5c 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java @@ -60,6 +60,7 @@ import org.apache.asterix.common.context.IStorageComponentProvider; import org.apache.asterix.common.exceptions.ACIDException; import org.apache.asterix.common.exceptions.CompilationException; +import org.apache.asterix.common.exceptions.ErrorCode; import org.apache.asterix.common.functions.FunctionSignature; import org.apache.asterix.common.metadata.IDataset; import org.apache.asterix.common.utils.JobUtils; @@ -2104,6 +2105,11 @@ String policyName = cfs.getPolicy(); MetadataTransactionContext mdTxnCtx = MetadataManager.INSTANCE.beginTransaction(); metadataProvider.setMetadataTxnContext(mdTxnCtx); +// Check whether feed is alive +if (ActiveJobNotificationHandler.INSTANCE +.getActiveEntityListener(new EntityId(Feed.EXTENSION_NAME, dataverseName, feedName)) != null) { +throw new CompilationException(ErrorCode.FEED_CHANGE_FEED_CONNECTIVITY_ON_ALIVE_FEED, feedName); +} // Transaction handling MetadataLockManager.INSTANCE.connectFeedBegin(metadataProvider.getLocks(), dataverseName, dataverseName + "." + datasetName, dataverseName + "." + feedName); @@ -2139,6 +2145,11 @@ String feedName = cfs.getFeedName().getValue(); MetadataTransactionContext mdTxnCtx = MetadataManager.INSTANCE.beginTransaction(); metadataProvider.setMetadataTxnContext(mdTxnCtx); +// Check whether feed is alive +if (ActiveJobNotificationHandler.INSTANCE +.getActiveEntityListener(new EntityId(Feed.EXTENSION_NAME, dataverseName, feedName)) != null) { +throw new CompilationException(ErrorCode.FEED_CHANGE_FEED_CONNECTIVITY_ON_ALIVE_FEED, feedName); +} MetadataLockManager.INSTANCE.disconnectFeedBegin(metadataProvider.getLocks(), dataverseName, dataverseName + "." + datasetName, dataverseName + "." + cfs.getFeedName()); try { diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/connect-live-feed/connect-live-feed.0.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/connect-live-feed/connect-live-feed.0.ddl.aql new file mode 100644 index 000..47bee4d --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/connect-live-feed/connect-live-feed.0.ddl.aql @@ -0,0 +1,40 @@ +/* + * 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
Change in asterixdb[master]: Add test cases for alive feed check when connect/disconnect
Jenkins has posted comments on this change. Change subject: Add test cases for alive feed check when connect/disconnect .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/95/ (1/6) -- To view, visit https://asterix-gerrit.ics.uci.edu/1664 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icbcc19da2a9f42bee21b52932ba4f19a0f01aeec Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Jenkins Gerrit-HasComments: No