[Standalone Agent] Disallow upgrade if upgrade is already in progress #3473

ycombinator · 2023-09-25T23:45:25Z

What does this PR do?

This PR prevents users of standalone Agents from being able to upgrade the Agent if an upgrade is already in progress.

Why is it important?

Attempting to upgrade an Agent while an upgrade is already in progress could corrupt the Agent installation.

Checklist

My code follows the style guidelines of this project
I have commented my code, particularly in hard-to-understand areas
~~I have made corresponding changes to the documentation~~
~~I have made corresponding change to the default configuration files~~
I have added tests that prove my fix is effective or that my feature works
I have added an entry in ./changelog/fragments using the changelog tool
I have added an integration test or an E2E test

Related issues

Relates Quick multiple upgrades while agent is still in grace period break agent installation #2706

elasticmachine · 2023-09-25T23:49:12Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Start Time: 2023-09-28T20:54:27.421+0000
Duration: 25 min 20 sec

Test stats 🧪

Test	Results
Failed	0
Passed	6333
Skipped	59
Total	6392

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

/test : Re-trigger the build.
/package : Generate the packages.
run integration tests : Run the Elastic Agent Integration tests.
run end-to-end tests : Generate the packages and run the E2E Tests.
run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

elasticmachine · 2023-09-26T00:13:39Z

🌐 Coverage report

Name	Metrics % (`covered/total`)	Diff
Packages	98.78% (`81/82`)	👍
Files	66.102% (`195/295`)	👍
Classes	65.693% (`360/548`)	👍
Methods	52.766% (`1135/2151`)	👍 0.022
Lines	38.208% (`12890/33736`)	👍 0.041
Conditionals	100.0% (`0/0`)	💚

elasticmachine · 2023-09-26T11:13:25Z

Pinging @elastic/elastic-agent (Team:Elastic-Agent)

pchila · 2023-09-28T06:40:01Z

pkg/control/v2/client/mocks/client.go

pchila · 2023-09-28T06:42:59Z

pkg/control/v2/client/client.go

@@ -156,6 +156,7 @@ type DiagnosticComponentResult struct {
 }

 // Client communicates to Elastic Agent through the control protocol.
+// go:generate mockery --name Client


pchila

Code looks good.
There is a clash between your changes for the upgrade integration test and the modifications proposed in #3477 so I guess we have to sync a bit to make sure we don't break/lose testcases (pinging @blakerouse so he can have a look at this)

For the code coverage, I guess we have to exclude mocks/*.go from analysis since most of the uncovered lines are actually the generated code.

ycombinator · 2023-09-28T12:19:04Z

For the code coverage, I guess we have to exclude mocks/*.go from analysis since most of the uncovered lines are actually the generated code.

Done in 98764d8.

mergify · 2023-09-28T18:20:33Z

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b standalone-prevent-quick-upgrades upstream/standalone-prevent-quick-upgrades
git merge upstream/main
git push upstream standalone-prevent-quick-upgrades

elastic-sonarqube · 2023-09-28T23:11:57Z

SonarQube Quality Gate

0 Bugs
0 Vulnerabilities
0 Security Hotspots
1 Code Smell

66.7% Coverage
0.0% Duplication

…#3473) * [Standalone] Disallow upgrade if upgrade is already in progress * Adding CHANGELOG entry * Add TODOs * WIP: integration test * Check for Watcher; move function to upgrade package * Check Upgrade Watcher PIDs first * Fix syntax error * Adjust test to start from older version * Fixing more errors * Fix test * Mock client * Fix typo (cherry picked from commit bc1982a) # Conflicts: # sonar-project.properties # testing/integration/upgrade_test.go

ycombinator added >bug backport-v8.10.0 labels Sep 25, 2023

mergify bot assigned ycombinator Sep 25, 2023

ycombinator added the Team:Elastic-Agent Label for the Agent team label Sep 26, 2023

ycombinator marked this pull request as ready for review September 26, 2023 11:13

ycombinator requested a review from a team as a code owner September 26, 2023 11:13

ycombinator requested review from AndersonQ and michalpristas September 26, 2023 11:13

jlind23 requested a review from pchila September 27, 2023 05:28

pchila reviewed Sep 28, 2023

View reviewed changes

pkg/control/v2/client/mocks/client.go Outdated

Copy link

Contributor

pchila Sep 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❤️

pchila reviewed Sep 28, 2023

View reviewed changes

pchila approved these changes Sep 28, 2023

View reviewed changes

ycombinator force-pushed the standalone-prevent-quick-upgrades branch from 85507df to 2cffce6 Compare September 28, 2023 16:51

ycombinator added 11 commits September 28, 2023 13:52

[Standalone] Disallow upgrade if upgrade is already in progress

2009928

Adding CHANGELOG entry

4f8a98b

Add TODOs

41b9493

WIP: integration test

fa3952e

Check for Watcher; move function to upgrade package

3dd855d

Check Upgrade Watcher PIDs first

7ac2f5d

Fix syntax error

d756607

Adjust test to start from older version

fd9b047

Fixing more errors

b4b2daa

Fix test

7a12973

Mock client

d1a6bd7

Fix typo

150a52d

ycombinator force-pushed the standalone-prevent-quick-upgrades branch from 2cffce6 to 150a52d Compare September 28, 2023 20:53

ycombinator enabled auto-merge (squash) September 28, 2023 20:53

ycombinator mentioned this pull request Sep 28, 2023

Create tests to ensure that Elastic Agent's upgrade are working as expected #2176

Open

15 tasks

ycombinator merged commit bc1982a into elastic:main Sep 29, 2023
24 checks passed

mergify bot mentioned this pull request Sep 29, 2023

[8.10](backport #3473) [Standalone Agent] Disallow upgrade if upgrade is already in progress #3488

Closed

ycombinator mentioned this pull request Sep 29, 2023

Quick multiple upgrades while agent is still in grace period break agent installation #2706

Closed

pchila mentioned this pull request Oct 6, 2023

Flaky test: m1/Test_CopyFile/TestShutdownCallback #3558

Open

ycombinator deleted the standalone-prevent-quick-upgrades branch November 27, 2023 20:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Standalone Agent] Disallow upgrade if upgrade is already in progress #3473

[Standalone Agent] Disallow upgrade if upgrade is already in progress #3473

ycombinator commented Sep 25, 2023 •

edited

elasticmachine commented Sep 25, 2023 •

edited

Build stats

Test stats 🧪

elasticmachine commented Sep 26, 2023 •

edited

elasticmachine commented Sep 26, 2023

pchila Sep 28, 2023

pchila Sep 28, 2023

pchila left a comment •

edited

ycombinator commented Sep 28, 2023

mergify bot commented Sep 28, 2023

elastic-sonarqube bot commented Sep 28, 2023

[Standalone Agent] Disallow upgrade if upgrade is already in progress #3473

[Standalone Agent] Disallow upgrade if upgrade is already in progress #3473

Conversation

ycombinator commented Sep 25, 2023 • edited

What does this PR do?

Why is it important?

Checklist

Related issues

elasticmachine commented Sep 25, 2023 • edited

💚 Build Succeeded

Build stats

Test stats 🧪

💚 Flaky test report

🤖 GitHub comments

elasticmachine commented Sep 26, 2023 • edited

🌐 Coverage report

elasticmachine commented Sep 26, 2023

pchila Sep 28, 2023

Choose a reason for hiding this comment

pchila Sep 28, 2023

Choose a reason for hiding this comment

pchila left a comment • edited

Choose a reason for hiding this comment

ycombinator commented Sep 28, 2023

mergify bot commented Sep 28, 2023

elastic-sonarqube bot commented Sep 28, 2023

ycombinator commented Sep 25, 2023 •

edited

elasticmachine commented Sep 25, 2023 •

edited

elasticmachine commented Sep 26, 2023 •

edited

pchila left a comment •

edited