-
Notifications
You must be signed in to change notification settings - Fork 68
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Enable show raw data and Job Viewer for the Jobs realm #730
Conversation
open_xdmod/modules/xdmod/integration_tests/scripts/bootstrap.sh
Outdated
Show resolved
Hide resolved
85e618f
to
90b9146
Compare
For the duplication of the "by-day" file, do you mean that the bulk is in the |
Yes. I'd like to be able to reference the base file and then just insert an extra couple of columns to the table definition and add one line to the aggregation query. |
77dcd09
to
fcfcff4
Compare
@@ -0,0 +1,66 @@ | |||
<?php | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This class needs a block at the top describing what it does and what data it encapsulates.
); | ||
} | ||
|
||
public function getJobSummary($user, $jobid) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do all of these methods return empty arrays? If there is a reason it should be documented in this class.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because there is no job summary data for the Jobs realm.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ditto for job timeseries data.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, lets document that in the class.
@@ -725,6 +725,15 @@ public function getCountQueryString() | |||
$data_query .= ") as a WHERE a.total IS NOT NULL"; | |||
return $data_query; | |||
} | |||
|
|||
protected function nextPdoIndex($value) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Need documentation here as well.
* @param array $scriptOptions the options to pass to the etlv2 class | ||
*/ | ||
protected function runEtlv2(array $scriptOptions) { | ||
if (empty($scriptOptions['chunk-size-days'])) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've created a task in Asana to work on putting code like this into a central location https://app.asana.com/0/806625283031961/917407032604343
@@ -71,6 +71,7 @@ | |||
"configuration/processor_buckets.json", | |||
"configuration/rawstatistics.json", | |||
"configuration/rawstatistics.d", | |||
{"configuration/rawstatistics.d/z_jobs.json": "rawstatistics.d/z_jobs.json"}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What does "z_jobs" stand for?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Config files are processed in alphabetical order. If the SUPREMM realm is installed this ensures that the jobs realm is listed after the SUPREMM realm in the realm list in the job viewer. This enforces the principle of least confusion since the default behavour of the job viewer will be to search supremm data (as it always was).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not that it matters, but the convention i usually see for this is\d+_\w
lets encrypt uses {0000 - 9999}_name
puppet apache modules uses {00 - 99}_name
Splitting this into two to make it easier to review. Please look at #733 first. |
This pull request enables the Job Viewer functionality for the Jobs realm. This one is quite big, but mostly new code. I decided to include a minor internal API change (there will be a corresponding pull request for SUPREMM to update to use the new API). The API change is in classes/Rest/Controllers/WarehouseControllerProvider.php and in the JobSearchPanel.js
EDIT - actually two minor API changes - the job viewer is now enabled if a module defines a realm config file in rawstatistics.d/. This is needed because multiple modules can now enable the job viewer
integration tests have been added to test the new code.
Couple of things to think about:
the
$ref
does not really improve the situation much because the bulk of the file is the column definintions.