Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Dev UI - scheduler improvements #18960

Merged
merged 1 commit into from
Jul 23, 2021
Merged

Dev UI - scheduler improvements #18960

merged 1 commit into from
Jul 23, 2021

Conversation

mkouba
Copy link
Contributor

@mkouba mkouba commented Jul 23, 2021

  • add option to pause/resume individual jobs with identity
  • add Scheduler#isPaused(identity)
  • show the configured values in the schedules table; e.g. "{cron.expr} configured as */5 * * * * ?"
  • fix links to config expressions in the docs

@mkouba mkouba requested a review from machi1990 July 23, 2021 08:40
@quarkus-bot
Copy link

quarkus-bot bot commented Jul 23, 2021 •
edited
Loading

This workflow status is outdated as a new workflow run has been triggered.

Failing Jobs - Building ebfaaeb

Status Name Step Test failures Logs Raw logs
✖ JVM Tests - JDK 11 Build Test failures Logs Raw logs
✖ JVM Tests - JDK 11 Windows Build Test failures Logs Raw logs
✖ JVM Tests - JDK 16 Build Test failures Logs Raw logs

Full information is available in the Build summary check run.

Test Failures

⚙️ JVM Tests - JDK 11 #

📦 integration-tests/devmode

✖ io.quarkus.test.devconsole.DevConsoleSchedulerSmokeTest.testScheduler line 29 - More details - Source on GitHub

java.lang.AssertionError: 
1 expectation failed.
Response body doesn't match expectation.
Expected: a string containing "Scheduled Methods"
  Actual: <!DOCTYPE html>
<html lang="en">
    <head>
        <!-- Required meta tags -->
        <meta charset="utf-8">
        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

        <!-- Bootstrap CSS -->
        <link rel="stylesheet" href="/q/dev/resources/css/bootstrap.min.css">
        <link rel="stylesheet" href="/q/dev/resources/fontawesome/css/all.min.css">
        <link rel="stylesheet" href="/q/dev/resources/css/dev-console.css?2">
        <link rel="stylesheet" href="/q/dev/resources/css/logstream.css">
        <link rel="stylesheet" href="/q/dev/resources/css/tests.css">
        <link rel="shortcut icon" type="image/png" href="/q/dev/resources/images/favicon.ico" >

        <style>
            
        </style>

        <script src="/q/dev/resources/js/jquery.min.js"></script>
        <script...

⚙️ JVM Tests - JDK 11 Windows #

📦 integration-tests/devmode

✖ io.quarkus.test.devconsole.DevConsoleSchedulerSmokeTest.testScheduler line 29 - More details - Source on GitHub

java.lang.AssertionError: 
1 expectation failed.
Response body doesn't match expectation.
Expected: a string containing "Scheduled Methods"
  Actual: <!DOCTYPE html>
<html lang="en">
    <head>
        <!-- Required meta tags -->
        <meta charset="utf-8">
        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

        <!-- Bootstrap CSS -->
        <link rel="stylesheet" href="/q/dev/resources/css/bootstrap.min.css">
        <link rel="stylesheet" href="/q/dev/resources/fontawesome/css/all.min.css">
        <link rel="stylesheet" href="/q/dev/resources/css/dev-console.css?2">
        <link rel="stylesheet" href="/q/dev/resources/css/logstream.css">
        <link rel="stylesheet" href="/q/dev/resources/css/tests.css">
        <link rel="shortcut icon" type="image/png" href="/q/dev/resources/images/favicon.ico" >

        <style>
            
        </style>

        <script src="/q/dev/resources/js/jquery.min.js"></script>
        <script...

⚙️ JVM Tests - JDK 16 #

📦 integration-tests/devmode

✖ io.quarkus.test.devconsole.DevConsoleSchedulerSmokeTest.testScheduler line 29 - More details - Source on GitHub

java.lang.AssertionError: 
1 expectation failed.
Response body doesn't match expectation.
Expected: a string containing "Scheduled Methods"
  Actual: <!DOCTYPE html>
<html lang="en">
    <head>
        <!-- Required meta tags -->
        <meta charset="utf-8">
        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

        <!-- Bootstrap CSS -->
        <link rel="stylesheet" href="/q/dev/resources/css/bootstrap.min.css">
        <link rel="stylesheet" href="/q/dev/resources/fontawesome/css/all.min.css">
        <link rel="stylesheet" href="/q/dev/resources/css/dev-console.css?2">
        <link rel="stylesheet" href="/q/dev/resources/css/logstream.css">
        <link rel="stylesheet" href="/q/dev/resources/css/tests.css">
        <link rel="shortcut icon" type="image/png" href="/q/dev/resources/images/favicon.ico" >

        <style>
            
        </style>

        <script src="/q/dev/resources/js/jquery.min.js"></script>
        <script...

@machi1990
Copy link
Member

the code lgtm.

@mkouba would you happen to have a screenshot of how it will look in the Dev UI?
Also there are some test failing.

@mkouba mkouba force-pushed the devui-scheduler-improvements branch from ebfaaeb to 983e002 Compare July 23, 2021 10:29
@mkouba
Copy link
Contributor Author

mkouba commented Jul 23, 2021

Also there are some test failing.

Yep, one of the Dev UI smoke tests failed - fixed.

would you happen to have a screenshot of how it will look in the Dev UI?

Screenshot from 2021-07-23 12-30-15

Note that the pause/resume job buttons cannot be placed in the "Actions" column because they apply to a specific @Scheduled which is repeatable, i.e. multiple buttons may exist for a particula scheduled method.

@quarkus-bot
Copy link

quarkus-bot bot commented Jul 23, 2021 •
edited
Loading

This workflow status is outdated as a new workflow run has been triggered.

Failing Jobs - Building 983e002

Status Name Step Test failures Logs Raw logs
✖ JVM Tests - JDK 11 Build Test failures Logs Raw logs
✖ JVM Tests - JDK 11 Windows Build Test failures Logs Raw logs
✖ JVM Tests - JDK 16 Build Test failures Logs Raw logs

Full information is available in the Build summary check run.

Test Failures

⚙️ JVM Tests - JDK 11 #

📦 integration-tests/devmode

✖ io.quarkus.test.devconsole.DevConsoleSchedulerSmokeTest.testScheduler line 29 - More details - Source on GitHub

java.lang.AssertionError: 
1 expectation failed.
Response body doesn't match expectation.
Expected: a string containing "Scheduled Methods"
  Actual: <!DOCTYPE html>
<html lang="en">
    <head>
        <!-- Required meta tags -->
        <meta charset="utf-8">
        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

        <!-- Bootstrap CSS -->
        <link rel="stylesheet" href="/q/dev/resources/css/bootstrap.min.css">
        <link rel="stylesheet" href="/q/dev/resources/fontawesome/css/all.min.css">
        <link rel="stylesheet" href="/q/dev/resources/css/dev-console.css?2">
        <link rel="stylesheet" href="/q/dev/resources/css/logstream.css">
        <link rel="stylesheet" href="/q/dev/resources/css/tests.css">
        <link rel="shortcut icon" type="image/png" href="/q/dev/resources/images/favicon.ico" >

        <style>
            
        </style>

        <script src="/q/dev/resources/js/jquery.min.js"></script>
        <script...

⚙️ JVM Tests - JDK 11 Windows #

📦 integration-tests/devmode

✖ io.quarkus.test.devconsole.DevConsoleSchedulerSmokeTest.testScheduler line 29 - More details - Source on GitHub

java.lang.AssertionError: 
1 expectation failed.
Response body doesn't match expectation.
Expected: a string containing "Scheduled Methods"
  Actual: <!DOCTYPE html>
<html lang="en">
    <head>
        <!-- Required meta tags -->
        <meta charset="utf-8">
        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

        <!-- Bootstrap CSS -->
        <link rel="stylesheet" href="/q/dev/resources/css/bootstrap.min.css">
        <link rel="stylesheet" href="/q/dev/resources/fontawesome/css/all.min.css">
        <link rel="stylesheet" href="/q/dev/resources/css/dev-console.css?2">
        <link rel="stylesheet" href="/q/dev/resources/css/logstream.css">
        <link rel="stylesheet" href="/q/dev/resources/css/tests.css">
        <link rel="shortcut icon" type="image/png" href="/q/dev/resources/images/favicon.ico" >

        <style>
            
        </style>

        <script src="/q/dev/resources/js/jquery.min.js"></script>
        <script...

⚙️ JVM Tests - JDK 16 #

📦 integration-tests/devmode

✖ io.quarkus.test.devconsole.DevConsoleSchedulerSmokeTest.testScheduler line 29 - More details - Source on GitHub

java.lang.AssertionError: 
1 expectation failed.
Response body doesn't match expectation.
Expected: a string containing "Scheduled Methods"
  Actual: <!DOCTYPE html>
<html lang="en">
    <head>
        <!-- Required meta tags -->
        <meta charset="utf-8">
        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

        <!-- Bootstrap CSS -->
        <link rel="stylesheet" href="/q/dev/resources/css/bootstrap.min.css">
        <link rel="stylesheet" href="/q/dev/resources/fontawesome/css/all.min.css">
        <link rel="stylesheet" href="/q/dev/resources/css/dev-console.css?2">
        <link rel="stylesheet" href="/q/dev/resources/css/logstream.css">
        <link rel="stylesheet" href="/q/dev/resources/css/tests.css">
        <link rel="shortcut icon" type="image/png" href="/q/dev/resources/images/favicon.ico" >

        <style>
            
        </style>

        <script src="/q/dev/resources/js/jquery.min.js"></script>
        <script...

@mkouba
Dev UI - scheduler improvements
6c0873d 
- add option to pause/resume individual jobs with identity
- add Scheduler#isPaused(identity)
- show the configured values in the schedules table; e.g. "{cron.expr} configured as */5 * * * * ?"
- fix links to config expressions in the docs
@mkouba mkouba force-pushed the devui-scheduler-improvements branch from 983e002 to 6c0873d Compare July 23, 2021 11:26
@machi1990
Copy link
Member

Also there are some test failing.

Yep, one of the Dev UI smoke tests failed - fixed.

perfect, let's wait for CI to pass.

would you happen to have a screenshot of how it will look in the Dev UI?

Screenshot from 2021-07-23 12-30-15

Really cool. Thank you for the improvement.

Note that the pause/resume job buttons cannot be placed in the "Actions" column because they apply to a specific @Scheduled which is repeatable, i.e. multiple buttons may exist for a particula scheduled method.

Makes sense.

@machi1990 machi1990 added the triage/waiting-for-ci Ready to merge when CI successfully finishes label Jul 23, 2021
@famod
Copy link
Member

famod commented Jul 23, 2021

Nice! Ship has sailed for 2.1 I suppose?

@mkouba
Copy link
Contributor Author

mkouba commented Jul 23, 2021

Nice! Ship has sailed for 2.1 I suppose?

Yeah, this should probably target 2.2.

@mkouba mkouba added this to the 2.2 - main milestone Jul 23, 2021
@mkouba mkouba merged commit 2ec298d into quarkusio:main Jul 23, 2021
@quarkus-bot quarkus-bot bot removed the triage/waiting-for-ci Ready to merge when CI successfully finishes label Jul 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@machi1990 machi1990 machi1990 approved these changes

Assignees
No one assigned
Labels
area/documentation area/scheduler
Projects
None yet
Milestone
2.2.0.CR1
Development

Successfully merging this pull request may close these issues.
3 participants
@mkouba @machi1990 @famod