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

Use the correct feature flag name (and guard it properly). #2035

Merged
merged 1 commit into from
Mar 30, 2021
Merged

Use the correct feature flag name (and guard it properly). #2035

merged 1 commit into from
Mar 30, 2021

Conversation

roberthbailey
Copy link
Member

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespace from that line:

/kind breaking

/kind bug

/kind cleanup
/kind documentation
/kind feature
/kind hotfix

What this PR does / Why we need it: Fixes a test case, which was not testing what it was intended to test.

Which issue(s) this PR fixes:

Closes #

Special notes for your reviewer:

@google-cla google-cla bot added the cla: yes label Mar 30, 2021
@roberthbailey roberthbailey mentioned this pull request Mar 30, 2021
Merged
roberthbailey
roberthbailey commented Mar 30, 2021
View reviewed changes
pkg/fleets/controller_test.go
@@ -196,7 +196,9 @@ func TestControllerSyncFleet(t *testing.T) {
})

t.Run("gameserverset with different image details", func(t *testing.T) {
assert.NoError(t, utilruntime.ParseFeatures(string(utilruntime.FeaturePlayerTracking)+"=true"))
utilruntime.FeatureTestMutex.Lock()
Copy link
Member Author

Choose a reason for hiding this comment

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

This was the only place in our test code that didn't use the feature test mutex, which could have caused a race condition.

pkg/fleets/controller_test.go
assert.NoError(t, utilruntime.ParseFeatures(string(utilruntime.FeaturePlayerTracking)+"=true"))
utilruntime.FeatureTestMutex.Lock()
defer utilruntime.FeatureTestMutex.Unlock()
assert.NoError(t, utilruntime.ParseFeatures(string(utilruntime.FeatureRollingUpdateOnReady)+"=true"))
Copy link
Member Author

Choose a reason for hiding this comment

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

Since this was setting the wrong feature to true, the test was always using the default feature value for rolling update on ready, which made it break when I changed the default.

@roberthbailey roberthbailey removed the request for review from aLekSer March 30, 2021 08:41
@agones-bot
Copy link
Collaborator

Build Failed 😱

Build Id: 6d100f85-13d8-46f5-8bc2-a0ea5f5ec5c7

To get permission to view the Cloud Build view, join the agones-discuss Google Group.

@agones-bot
Copy link
Collaborator

Build Failed 😱

Build Id: f4a7b847-7b8e-4780-8879-f5f1f4860e96

To get permission to view the Cloud Build view, join the agones-discuss Google Group.

@roberthbailey
Copy link
Member Author

Our helm install is broken again: Error: UPGRADE FAILED: another operation (install/upgrade/rollback) is in progress

@agones-bot
Copy link
Collaborator

Build Failed 😱

Build Id: 2bb738d5-6a2b-421f-91f8-cd2e50a50450

To get permission to view the Cloud Build view, join the agones-discuss Google Group.

@roberthbailey
Copy link
Member Author

Tests failed with fatal error: concurrent map read and map write.

@agones-bot
Copy link
Collaborator

Build Succeeded 👏

Build Id: aa59afa1-ca54-4300-b418-c0d44bc86659

The following development artifacts have been built, and will exist for the next 30 days:

A preview of the website (the last 30 builds are retained):

To install this version:

  • git fetch https://github.com/googleforgames/agones.git pull/2035/head:pr_2035 && git checkout pr_2035
  • helm install ./install/helm/agones --namespace agones-system --name agones --set agones.image.tag=1.14.0-8d951c1

markmandel
markmandel approved these changes Mar 30, 2021
View reviewed changes
Copy link
Member

@markmandel markmandel left a comment

Choose a reason for hiding this comment

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

Good catch!

@google-oss-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: markmandel, roberthbailey

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [markmandel,roberthbailey]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@markmandel markmandel added this to the 1.14.0 milestone Mar 30, 2021
@markmandel markmandel added area/tests Unit tests, e2e tests, anything to make sure things don't break kind/bug These are bugs. labels Mar 30, 2021
@markmandel markmandel merged commit 3daf2d6 into googleforgames:main Mar 30, 2021
@roberthbailey roberthbailey deleted the fleet-controller-test branch September 23, 2021 16:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@markmandel markmandel markmandel approved these changes

Assignees

@markmandel markmandel

Labels
approved area/tests Unit tests, e2e tests, anything to make sure things don't break cla: yes kind/bug These are bugs. lgtm size/XS
Projects
None yet
Milestone
1.14.0
Development

Successfully merging this pull request may close these issues.
4 participants
@roberthbailey @agones-bot @google-oss-robot @markmandel