You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by "nlippis (via GitHub)" <gi...@apache.org> on 2023/03/27 23:36:05 UTC
[GitHub] [druid] nlippis opened a new pull request, #13986: Kubernetes task runner live reports
nlippis opened a new pull request, #13986:
URL: https://github.com/apache/druid/pull/13986
<!-- Thanks for trying to help us make Apache Druid be the best it can be! Please fill out as much of the following information as is possible (where relevant, and remove it when irrelevant) to help make the intention and scope of this PR clear in order to ease review. -->
<!-- Please read the doc for contribution (https://github.com/apache/druid/blob/master/CONTRIBUTING.md) before making this PR. Also, once you open a PR, please _avoid using force pushes and rebasing_ since these make it difficult for reviewers to see what you've changed in response to their reviews. See [the 'If your pull request shows conflicts with master' section](https://github.com/apache/druid/blob/master/CONTRIBUTING.md#if-your-pull-request-shows-conflicts-with-master) for more details. -->
<!-- Replace XXXX with the id of the issue fixed in this PR. Remove this section if there is no corresponding issue. Don't reference the issue in the title of this pull-request. -->
<!-- If you are a committer, follow the PR action item checklist for committers:
https://github.com/apache/druid/blob/master/dev/committer-instructions.md#pr-and-issue-action-item-checklist-for-committers. -->
### Implement Live Reports for the KubernetesTaskRunner
<!-- Describe the goal of this PR, what problem are you fixing. If there is a corresponding issue (referenced above), it's not necessary to repeat the description here, however, you may choose to keep one summary sentence. -->
<!-- Describe your patch: what did you change in code? How did you fix the problem? -->
<!-- If there are several relatively logically separate changes in this PR, create a mini-section for each of them. For example: -->
<!--
In each section, please describe design decisions made, including:
- Choice of algorithms
- Behavioral aspects. What configuration values are acceptable? How are corner cases and error conditions handled, such as when there are insufficient resources?
- Class organization and design (how the logic is split between classes, inheritance, composition, design patterns)
- Method organization and design (how the logic is split between methods, parameters and return types)
- Naming (class, method, API, configuration, HTTP endpoint, names of emitted metrics)
-->
<!-- It's good to describe an alternative design (or mention an alternative name) for every design (or naming) decision point and compare the alternatives with the designs that you've implemented (or the names you've chosen) to highlight the advantages of the chosen designs and names. -->
<!-- If there was a discussion of the design of the feature implemented in this PR elsewhere (e. g. a "Proposal" issue, any other issue, or a thread in the development mailing list), link to that discussion from this PR description and explain what have changed in your final design compared to your original proposal or the consensus version in the end of the discussion. If something hasn't changed since the original discussion, you can omit a detailed discussion of those aspects of the design here, perhaps apart from brief mentioning for the sake of readability of this PR description. -->
<!-- Some of the aspects mentioned above may be omitted for simple and small changes. -->
<!-- Give your best effort to summarize your changes in a couple of sentences aimed toward Druid users.
If your change doesn't have end user impact, you can skip this section.
For tips about how to write a good release note, see [Release notes](https://github.com/apache/druid/blob/master/CONTRIBUTING.md#release-notes).
-->
<hr>
##### Key changed/added classes in this PR
* `KubernetesTaskRunner`
<hr>
<!-- Check the items by putting "x" in the brackets for the done things. Not all of these items apply to every PR. Remove the items which are not done or not relevant to the PR. None of the items from the checklist below are strictly necessary, but it would be very helpful if you at least self-review the PR. -->
This PR has:
- [x] been self-reviewed.
- [ ] using the [concurrency checklist](https://github.com/apache/druid/blob/master/dev/code-review/concurrency.md) (Remove this item if the PR doesn't have any relation to concurrency.)
- [ ] added documentation for new or modified features or behaviors.
- [ ] a release note entry in the PR description.
- [ ] added Javadocs for most classes and all non-trivial methods. Linked related entities via Javadoc links.
- [ ] added or updated version, license, or notice information in [licenses.yaml](https://github.com/apache/druid/blob/master/dev/license.md)
- [ ] added comments explaining the "why" and the intent of the code wherever would not be obvious for an unfamiliar reader.
- [x] added unit tests or modified existing tests to cover new code paths, ensuring the threshold for [code coverage](https://github.com/apache/druid/blob/master/dev/code-review/code-coverage.md) is met.
- [ ] added integration tests.
- [x] been tested in a test Druid cluster.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] nlippis commented on a diff in pull request #13986: Kubernetes task runner live reports
Posted by "nlippis (via GitHub)" <gi...@apache.org>.
nlippis commented on code in PR #13986:
URL: https://github.com/apache/druid/pull/13986#discussion_r1152191930
##########
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerTest.java:
##########
@@ -355,6 +368,243 @@ public void testTheK8sRestartStateAndHandleJobsThatAlreadyCompletedWhileDown() t
verify(spyRunner, times(1)).run(eq(task));
}
+ @Test
+ public void testStreamTaskReports() throws Exception
+ {
+ Task task = makeTask();
+ K8sTaskId k8sTaskId = new K8sTaskId(task.getId());
+
+ Job job = mock(Job.class);
+ ObjectMeta jobMetadata = mock(ObjectMeta.class);
+ when(jobMetadata.getName()).thenReturn(k8sTaskId.getK8sTaskId());
+ JobStatus status = mock(JobStatus.class);
+ when(status.getActive()).thenReturn(1).thenReturn(null);
+ when(job.getStatus()).thenReturn(status);
+ when(job.getMetadata()).thenReturn(jobMetadata);
+
+ Pod peonPod = mock(Pod.class);
+ ObjectMeta metadata = mock(ObjectMeta.class);
+ when(metadata.getName()).thenReturn("peonPodName");
+ when(peonPod.getMetadata()).thenReturn(metadata);
+ PodStatus podStatus = mock(PodStatus.class);
+ when(podStatus.getPodIP()).thenReturn("SomeIP");
+ when(peonPod.getStatus()).thenReturn(podStatus);
+
+ K8sTaskAdapter adapter = mock(K8sTaskAdapter.class);
+ when(adapter.fromTask(eq(task))).thenReturn(job);
+
+ DruidKubernetesPeonClient peonClient = mock(DruidKubernetesPeonClient.class);
+
+ when(peonClient.jobExists(eq(k8sTaskId))).thenReturn(Optional.fromNullable(null));
+ when(peonClient.launchJobAndWaitForStart(isA(Job.class), anyLong(), isA(TimeUnit.class))).thenReturn(peonPod);
+ when(peonClient.getMainJobPod(eq(k8sTaskId))).thenReturn(peonPod);
+ when(peonClient.waitForJobCompletion(eq(k8sTaskId), anyLong(), isA(TimeUnit.class))).thenReturn(new JobResponse(
+ job,
+ PeonPhase.SUCCEEDED
+ ));
Review Comment:
I am not happy with all of this mocking either, however it is how the other tests in this class are written so I wanted to continue with the existing methodology. I have a follow up PR that refactors the run method and will enable the type of testing that you mentioned. I will propose the PR when all of the PRs necessary for our immediate purpose have been merged.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] abhishekagarwal87 merged pull request #13986: Kubernetes task runner live reports
Posted by "abhishekagarwal87 (via GitHub)" <gi...@apache.org>.
abhishekagarwal87 merged PR #13986:
URL: https://github.com/apache/druid/pull/13986
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] abhishekagarwal87 commented on a diff in pull request #13986: Kubernetes task runner live reports
Posted by "abhishekagarwal87 (via GitHub)" <gi...@apache.org>.
abhishekagarwal87 commented on code in PR #13986:
URL: https://github.com/apache/druid/pull/13986#discussion_r1151530014
##########
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerTest.java:
##########
@@ -355,6 +368,243 @@ public void testTheK8sRestartStateAndHandleJobsThatAlreadyCompletedWhileDown() t
verify(spyRunner, times(1)).run(eq(task));
}
+ @Test
+ public void testStreamTaskReports() throws Exception
+ {
+ Task task = makeTask();
+ K8sTaskId k8sTaskId = new K8sTaskId(task.getId());
+
+ Job job = mock(Job.class);
+ ObjectMeta jobMetadata = mock(ObjectMeta.class);
+ when(jobMetadata.getName()).thenReturn(k8sTaskId.getK8sTaskId());
+ JobStatus status = mock(JobStatus.class);
+ when(status.getActive()).thenReturn(1).thenReturn(null);
+ when(job.getStatus()).thenReturn(status);
+ when(job.getMetadata()).thenReturn(jobMetadata);
+
+ Pod peonPod = mock(Pod.class);
+ ObjectMeta metadata = mock(ObjectMeta.class);
+ when(metadata.getName()).thenReturn("peonPodName");
+ when(peonPod.getMetadata()).thenReturn(metadata);
+ PodStatus podStatus = mock(PodStatus.class);
+ when(podStatus.getPodIP()).thenReturn("SomeIP");
+ when(peonPod.getStatus()).thenReturn(podStatus);
+
+ K8sTaskAdapter adapter = mock(K8sTaskAdapter.class);
+ when(adapter.fromTask(eq(task))).thenReturn(job);
+
+ DruidKubernetesPeonClient peonClient = mock(DruidKubernetesPeonClient.class);
+
+ when(peonClient.jobExists(eq(k8sTaskId))).thenReturn(Optional.fromNullable(null));
+ when(peonClient.launchJobAndWaitForStart(isA(Job.class), anyLong(), isA(TimeUnit.class))).thenReturn(peonPod);
+ when(peonClient.getMainJobPod(eq(k8sTaskId))).thenReturn(peonPod);
+ when(peonClient.waitForJobCompletion(eq(k8sTaskId), anyLong(), isA(TimeUnit.class))).thenReturn(new JobResponse(
+ job,
+ PeonPhase.SUCCEEDED
+ ));
Review Comment:
a simpler alternative could have been to extend `KubernetesTaskRunner` and override `run()`. The `run` method would simply add the task to its state.
The thing with mocking like this is that its too tightly coupled with the code. One has to keep track of all the calls with the arguments required even though they are not being tested.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] abhishekagarwal87 commented on a diff in pull request #13986: Kubernetes task runner live reports
Posted by "abhishekagarwal87 (via GitHub)" <gi...@apache.org>.
abhishekagarwal87 commented on code in PR #13986:
URL: https://github.com/apache/druid/pull/13986#discussion_r1151525053
##########
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerTest.java:
##########
@@ -355,6 +368,243 @@ public void testTheK8sRestartStateAndHandleJobsThatAlreadyCompletedWhileDown() t
verify(spyRunner, times(1)).run(eq(task));
}
+ @Test
+ public void testStreamTaskReports() throws Exception
+ {
+ Task task = makeTask();
+ K8sTaskId k8sTaskId = new K8sTaskId(task.getId());
+
+ Job job = mock(Job.class);
+ ObjectMeta jobMetadata = mock(ObjectMeta.class);
+ when(jobMetadata.getName()).thenReturn(k8sTaskId.getK8sTaskId());
+ JobStatus status = mock(JobStatus.class);
+ when(status.getActive()).thenReturn(1).thenReturn(null);
+ when(job.getStatus()).thenReturn(status);
+ when(job.getMetadata()).thenReturn(jobMetadata);
+
+ Pod peonPod = mock(Pod.class);
+ ObjectMeta metadata = mock(ObjectMeta.class);
+ when(metadata.getName()).thenReturn("peonPodName");
+ when(peonPod.getMetadata()).thenReturn(metadata);
+ PodStatus podStatus = mock(PodStatus.class);
+ when(podStatus.getPodIP()).thenReturn("SomeIP");
+ when(peonPod.getStatus()).thenReturn(podStatus);
+
+ K8sTaskAdapter adapter = mock(K8sTaskAdapter.class);
+ when(adapter.fromTask(eq(task))).thenReturn(job);
+
+ DruidKubernetesPeonClient peonClient = mock(DruidKubernetesPeonClient.class);
+
+ when(peonClient.jobExists(eq(k8sTaskId))).thenReturn(Optional.fromNullable(null));
+ when(peonClient.launchJobAndWaitForStart(isA(Job.class), anyLong(), isA(TimeUnit.class))).thenReturn(peonPod);
+ when(peonClient.getMainJobPod(eq(k8sTaskId))).thenReturn(peonPod);
+ when(peonClient.waitForJobCompletion(eq(k8sTaskId), anyLong(), isA(TimeUnit.class))).thenReturn(new JobResponse(
+ job,
+ PeonPhase.SUCCEEDED
+ ));
Review Comment:
is all this mocking really required given that we are only calling streamTaskReports? There is nothing much happening in the constructor of `KubernetesTaskRunner` either.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org