Change in asterixdb[trinity]: [NO ISSUE]: Track more requests + jobs counts
>From Hussain Towaileb :
Hussain Towaileb has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263 )
Change subject: [NO ISSUE]: Track more requests + jobs counts
..
[NO ISSUE]: Track more requests + jobs counts
Change-Id: I8fa31a1e6bb6b1f1bcf90c59da646fc47546fc7c
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263
Tested-by: Jenkins
Integration-Tests: Jenkins
Reviewed-by: Ali Alsuliman
---
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/IJobManager.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IRequestTracker.java
M
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RequestTracker.java
6 files changed, 144 insertions(+), 15 deletions(-)
Approvals:
Ali Alsuliman: Looks good to me, approved
Jenkins: Verified; Verified
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
index f84e45a..da21769 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
@@ -166,7 +166,7 @@
return resultStatus;
}
-HttpResponseStatus getHttpStatus() {
+public HttpResponseStatus getHttpStatus() {
return httpResponseStatus;
}
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 1110cd3..3cac3d8 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
@@ -529,6 +529,9 @@
"Unexpected statement: " + kind);
}
}
+} catch (Exception ex) {
+this.appCtx.getRequestTracker().incrementFailedRequests();
+throw ex;
} finally {
// async queries are completed after their job completes
if (ResultDelivery.ASYNC != resultDelivery) {
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IRequestTracker.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IRequestTracker.java
index 0019015..b2dc309 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IRequestTracker.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IRequestTracker.java
@@ -81,4 +81,14 @@
* @return the total number of requests since cluster start/restart
*/
long getTotalNumberOfRequests();
+
+/**
+ * increments total number of failed requests
+ */
+void incrementFailedRequests();
+
+/**
+ * @return the total number of failed requests
+ */
+long getTotalNumberOfFailedRequests();
}
diff --git
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RequestTracker.java
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RequestTracker.java
index c9425c6..c16f825 100644
---
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RequestTracker.java
+++
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RequestTracker.java
@@ -39,11 +39,13 @@
private final CircularFifoQueue completedRequests;
private final ICcApplicationContext ccAppCtx;
private final AtomicLong numRequests;
+private final AtomicLong numOfFailedRequests;
public RequestTracker(ICcApplicationContext ccAppCtx) {
this.ccAppCtx = ccAppCtx;
completedRequests = new
CircularFifoQueue<>(ccAppCtx.getExternalProperties().getRequestsArchiveSize());
numRequests = new AtomicLong(0);
+numOfFailedRequests = new AtomicLong(0);
}
@Override
@@ -120,4 +122,14 @@
public long getTotalNumberOfRequests() {
return numRequests.get();
}
+
+@Override
+public void incrementFailedRequests() {
+numOfFailedRequests.incrementAndGet();
+}
+
+@Override
+public long getTotalNumberOfFailedRequests() {
+return numOfFailedRequests.get();
+}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache
Change in asterixdb[trinity]: [NO ISSUE]: Track more requests + jobs counts
>From Ali Alsuliman : Attention is currently required from: Murtadha Hubail, Michael Blow, Hussain Towaileb. Ali Alsuliman has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263 ) Change subject: [NO ISSUE]: Track more requests + jobs counts .. Patch Set 3: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: trinity Gerrit-Change-Id: I8fa31a1e6bb6b1f1bcf90c59da646fc47546fc7c Gerrit-Change-Number: 18263 Gerrit-PatchSet: 3 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Attention: Murtadha Hubail Gerrit-Attention: Michael Blow Gerrit-Attention: Hussain Towaileb Gerrit-Comment-Date: Thu, 09 May 2024 12:42:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[trinity]: [NO ISSUE]: Track more requests + jobs counts
>From Hussain Towaileb :
Attention is currently required from: Murtadha Hubail, Ali Alsuliman, Michael
Blow.
Hussain Towaileb has posted comments on this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263 )
Change subject: [NO ISSUE]: Track more requests + jobs counts
..
Patch Set 3:
(3 comments)
File
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java:
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263/comment/1b02a7b9_158486ca
PS2, Line 532: catch (Exception ex) {
:
this.appCtx.getRequestTracker().incrementFailedRequests();
: throw ex;
> What about ASYNC queries? Do we count them somewhere?
Still looking into it.
File
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IRequestTracker.java:
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263/comment/9bb6c96e_faad0e1e
PS2, Line 91: gets
> 'The' instead of 'gets' similar to the above ones.
Done
File
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java:
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263/comment/50761d9a_84ef0b61
PS2, Line 151: incrementCancelledJobs();
> What about the jobs that are PENDING (they are in the queue and not in the
> activeRunMap)? They can g […]
Done
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: trinity
Gerrit-Change-Id: I8fa31a1e6bb6b1f1bcf90c59da646fc47546fc7c
Gerrit-Change-Number: 18263
Gerrit-PatchSet: 3
Gerrit-Owner: Hussain Towaileb
Gerrit-Reviewer: Ali Alsuliman
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Hussain Towaileb
Gerrit-Reviewer: Jenkins
Gerrit-Reviewer: Michael Blow
Gerrit-Reviewer: Murtadha Hubail
Gerrit-Attention: Murtadha Hubail
Gerrit-Attention: Ali Alsuliman
Gerrit-Attention: Michael Blow
Gerrit-Comment-Date: Thu, 09 May 2024 04:11:17 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Ali Alsuliman
Gerrit-MessageType: comment
Change in asterixdb[trinity]: [NO ISSUE]: Track more requests + jobs counts
>From Jenkins : Attention is currently required from: Murtadha Hubail, Michael Blow, Hussain Towaileb. Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263 ) Change subject: [NO ISSUE]: Track more requests + jobs counts .. Patch Set 3: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-trigger/495/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: trinity Gerrit-Change-Id: I8fa31a1e6bb6b1f1bcf90c59da646fc47546fc7c Gerrit-Change-Number: 18263 Gerrit-PatchSet: 3 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Attention: Murtadha Hubail Gerrit-Attention: Michael Blow Gerrit-Attention: Hussain Towaileb Gerrit-Comment-Date: Wed, 08 May 2024 19:05:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[trinity]: [NO ISSUE]: Track more requests + jobs counts
>From Hussain Towaileb : Attention is currently required from: Murtadha Hubail, Michael Blow, Hussain Towaileb. Hello Murtadha Hubail, Ali Alsuliman, Jenkins, Michael Blow, Anon. E. Moose #1000171, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263 to look at the new patch set (#3). Change subject: [NO ISSUE]: Track more requests + jobs counts .. [NO ISSUE]: Track more requests + jobs counts Change-Id: I8fa31a1e6bb6b1f1bcf90c59da646fc47546fc7c --- M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/IJobManager.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IRequestTracker.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RequestTracker.java 6 files changed, 140 insertions(+), 15 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/63/18263/3 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: trinity Gerrit-Change-Id: I8fa31a1e6bb6b1f1bcf90c59da646fc47546fc7c Gerrit-Change-Number: 18263 Gerrit-PatchSet: 3 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Attention: Murtadha Hubail Gerrit-Attention: Michael Blow Gerrit-Attention: Hussain Towaileb Gerrit-MessageType: newpatchset
Change in asterixdb[trinity]: [NO ISSUE]: Track more requests + jobs counts
>From Ali Alsuliman :
Attention is currently required from: Murtadha Hubail, Michael Blow, Hussain
Towaileb.
Ali Alsuliman has posted comments on this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263 )
Change subject: [NO ISSUE]: Track more requests + jobs counts
..
Patch Set 2:
(3 comments)
File
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java:
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263/comment/a64dc4dd_8415b3e6
PS2, Line 532: catch (Exception ex) {
:
this.appCtx.getRequestTracker().incrementFailedRequests();
: throw ex;
What about ASYNC queries? Do we count them somewhere?
File
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IRequestTracker.java:
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263/comment/92d5fdbf_fbc155fd
PS2, Line 91: gets
'The' instead of 'gets' similar to the above ones.
File
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java:
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263/comment/b709e5fb_62efa2f8
PS2, Line 151: incrementCancelledJobs();
What about the jobs that are PENDING (they are in the queue and not in the
activeRunMap)? They can get cancelled while they are PENDING in the queue? Is
that taken care of somewhere?
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: trinity
Gerrit-Change-Id: I8fa31a1e6bb6b1f1bcf90c59da646fc47546fc7c
Gerrit-Change-Number: 18263
Gerrit-PatchSet: 2
Gerrit-Owner: Hussain Towaileb
Gerrit-Reviewer: Ali Alsuliman
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Hussain Towaileb
Gerrit-Reviewer: Jenkins
Gerrit-Reviewer: Michael Blow
Gerrit-Reviewer: Murtadha Hubail
Gerrit-Attention: Murtadha Hubail
Gerrit-Attention: Michael Blow
Gerrit-Attention: Hussain Towaileb
Gerrit-Comment-Date: Wed, 08 May 2024 16:53:33 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in asterixdb[trinity]: [NO ISSUE]: Track more requests + jobs counts
>From Hussain Towaileb : Attention is currently required from: Murtadha Hubail, Ali Alsuliman, Michael Blow. Hussain Towaileb has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263 ) Change subject: [NO ISSUE]: Track more requests + jobs counts .. Patch Set 2: Code-Review+1 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: trinity Gerrit-Change-Id: I8fa31a1e6bb6b1f1bcf90c59da646fc47546fc7c Gerrit-Change-Number: 18263 Gerrit-PatchSet: 2 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Attention: Murtadha Hubail Gerrit-Attention: Ali Alsuliman Gerrit-Attention: Michael Blow Gerrit-Comment-Date: Wed, 08 May 2024 12:06:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[trinity]: [NO ISSUE]: Track more requests + jobs counts
>From Jenkins : Attention is currently required from: Hussain Towaileb. Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263 ) Change subject: [NO ISSUE]: Track more requests + jobs counts .. Patch Set 2: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-trigger/486/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: trinity Gerrit-Change-Id: I8fa31a1e6bb6b1f1bcf90c59da646fc47546fc7c Gerrit-Change-Number: 18263 Gerrit-PatchSet: 2 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Attention: Hussain Towaileb Gerrit-Comment-Date: Tue, 07 May 2024 20:42:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[trinity]: [NO ISSUE]: Track more requests + jobs counts
>From Hussain Towaileb : Attention is currently required from: Hussain Towaileb. Hello Jenkins, Anon. E. Moose #1000171, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263 to look at the new patch set (#2). Change subject: [NO ISSUE]: Track more requests + jobs counts .. [NO ISSUE]: Track more requests + jobs counts Change-Id: I8fa31a1e6bb6b1f1bcf90c59da646fc47546fc7c --- M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/IJobManager.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IRequestTracker.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RequestTracker.java 6 files changed, 139 insertions(+), 15 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/63/18263/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: trinity Gerrit-Change-Id: I8fa31a1e6bb6b1f1bcf90c59da646fc47546fc7c Gerrit-Change-Number: 18263 Gerrit-PatchSet: 2 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Attention: Hussain Towaileb Gerrit-MessageType: newpatchset
Change in asterixdb[trinity]: [NO ISSUE]: Track more requests + jobs counts
Attention is currently required from: Hussain Towaileb. Anon. E. Moose #1000171 has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263 ) Change subject: [NO ISSUE]: Track more requests + jobs counts .. Patch Set 1: Contrib-2 Analytics Compatibility Tests Failed https://cbjenkins.page.link/B1rSHa6segwzwiSW9 : UNSTABLE -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: trinity Gerrit-Change-Id: I8fa31a1e6bb6b1f1bcf90c59da646fc47546fc7c Gerrit-Change-Number: 18263 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Attention: Hussain Towaileb Gerrit-Comment-Date: Thu, 02 May 2024 18:58:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[trinity]: [NO ISSUE]: Track more requests + jobs counts
>From Jenkins : Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263 ) Change subject: [NO ISSUE]: Track more requests + jobs counts .. Patch Set 1: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-trigger/443/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: trinity Gerrit-Change-Id: I8fa31a1e6bb6b1f1bcf90c59da646fc47546fc7c Gerrit-Change-Number: 18263 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-CC: Anon. E. Moose #1000171 Gerrit-Comment-Date: Thu, 02 May 2024 17:28:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[trinity]: [NO ISSUE]: Track more requests + jobs counts
Anon. E. Moose #1000171 has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263 ) Change subject: [NO ISSUE]: Track more requests + jobs counts .. Patch Set 1: Analytics Compatibility Compilation Successful https://cbjenkins.page.link/A8g4aoa6nRzbqXH99 : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: trinity Gerrit-Change-Id: I8fa31a1e6bb6b1f1bcf90c59da646fc47546fc7c Gerrit-Change-Number: 18263 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-CC: Anon. E. Moose #1000171 Gerrit-CC: Jenkins Gerrit-Comment-Date: Thu, 02 May 2024 17:01:47 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in asterixdb[trinity]: [NO ISSUE]: Track more requests + jobs counts
>From Hussain Towaileb :
Hussain Towaileb has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18263 )
Change subject: [NO ISSUE]: Track more requests + jobs counts
..
[NO ISSUE]: Track more requests + jobs counts
Change-Id: I8fa31a1e6bb6b1f1bcf90c59da646fc47546fc7c
---
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/IJobManager.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
M
hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpRequestCapacityController.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
M
hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java
5 files changed, 129 insertions(+), 16 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/63/18263/1
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
index f84e45a..07c76a0 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
@@ -433,7 +433,7 @@
return true;
case REQUEST_TIMEOUT:
LOGGER.info(() -> "handleException: request execution
timed out: " + param.toString());
-executionState.setStatus(ResultStatus.TIMEOUT,
HttpResponseStatus.OK);
+executionState.setStatus(ResultStatus.TIMEOUT,
HttpResponseStatus.SERVICE_UNAVAILABLE);
return true;
case REJECT_NODE_UNREGISTERED:
case REJECT_BAD_CLUSTER_STATE:
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/IJobManager.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/IJobManager.java
index b2795d4..8d44542 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/IJobManager.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/IJobManager.java
@@ -130,4 +130,24 @@
* @return the maximum number of jobs to queue before rejecting new jobs
*/
int getJobQueueCapacity();
+
+/**
+ * @return total jobs
+ */
+long getTotalJobs();
+
+/**
+ * @return total failed jobs
+ */
+long getTotalFailedJobs();
+
+/**
+ * @return total cancelled jobs
+ */
+long getTotalCancelledJobs();
+
+/**
+ * @return total rejected jobs
+ */
+long getTotalRejectedJobs();
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
index 4882f4a..7a99a3d 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
@@ -30,10 +30,12 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
import org.apache.hyracks.api.exceptions.ErrorCode;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.api.exceptions.HyracksException;
+import org.apache.hyracks.api.exceptions.IError;
import org.apache.hyracks.api.job.ActivityClusterGraph;
import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.api.job.JobSpecification;
@@ -66,11 +68,19 @@
private final Map runMapArchive;
private final Map> runMapHistory;
private final IJobCapacityController jobCapacityController;
+private final AtomicLong totalJobs;
+private final AtomicLong totalFailedJobs;
+private final AtomicLong totalCancelledJobs;
+private final AtomicLong totalRejectedJobs;
private IJobQueue jobQueue;
public JobManager(CCConfig ccConfig, ClusterControllerService ccs,
IJobCapacityController jobCapacityController) {
this.ccs = ccs;
this.jobCapacityController = jobCapacityController;
+this.totalJobs = new AtomicLong();
+this.totalFailedJobs = new AtomicLong();
+this.totalCancelledJobs = new AtomicLong();
+this.totalRejectedJobs = new AtomicLong
