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

Fix/caas relation datebag inconsistency #10270

Merged
merged 12 commits into from
Jun 7, 2019
Merged

Fix/caas relation datebag inconsistency #10270

merged 12 commits into from
Jun 7, 2019

Conversation

ycliuhw
Copy link
Member

@ycliuhw ycliuhw commented May 31, 2019 •
edited
Loading

Description of change

Fix: statefulset pod units are been removed then cause relation data bag lost;

QA steps

  • deploy mediawiki
  • kill pod;
$ kubectl delete pod/mariadb-k8s-0 -n $NS

  • monitor juju status to confirm, the unit number is not changed;

  • add/remove units;

$ juju add-unit mariadb-k8s -n 1
$ juju remove-unit mariadb-k8s --num-units=2

Documentation changes

None

Bug reference

https://bugs.launchpad.net/juju/+bug/1830745

@ycliuhw
Copy link
Member Author

ycliuhw commented May 31, 2019

https://bugs.launchpad.net/juju/+bug/1830745

@ycliuhw
Copy link
Member Author

ycliuhw commented May 31, 2019

pod spec set destroys relation data

@ycliuhw ycliuhw requested a review from wallyworld June 3, 2019 00:21
ycliuhw added 10 commits June 7, 2019 15:15
@ycliuhw
Make updateUnitsFromCloud doing nothing if it is not possible to deci…
091e00a 
…de if units should be removed or not, also remove dying or dead unit if it has already been removed from the cloud
@ycliuhw
Include pods that are still been initiallizing when fetching pods
a48e94d
@ycliuhw
Add current generation of deplopyment/statefulset to caas.Service
d797e1e
@ycliuhw
Introduce 'Generation' to Application to versioning the cfg change
604b0fe
@ycliuhw
Include current generation in SetScale if it is triggered by k8s events
867abfd
@ycliuhw
Move DesiredScale from Application to CloudService; Add bool applied …
2db5ccf 
…to CloudService for ensuring desiredScale immutable until it is applied to to the cluster;
@ycliuhw
Include Scale and Generation in UpdateApplicationService and UpdateUn…
caaff3e 
…its facades
@ycliuhw
Move DesiredScale to Application but leave Generation and DesiredScal…
d8a5086 
…eProtected in CloudService
@ycliuhw
Translate ForbiddenErr to CodeForbidden in ServerError
aa7b6a7
@ycliuhw
Ignore SetScale errors in caas app and deployment workers
65e8231
@ycliuhw ycliuhw force-pushed the fix/caas-relation-datebag-inconsistency branch 2 times, most recently from a3e2b68 to 11cd353 Compare June 7, 2019 06:22
wallyworld
wallyworld approved these changes Jun 7, 2019
View reviewed changes
Copy link
Member

@wallyworld wallyworld left a comment

Choose a reason for hiding this comment

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

Main issue to fix is that it will break older operators (need to allow nil generation)

apiserver/facades/controller/caasunitprovisioner/provisioner.go Outdated Show resolved Hide resolved
apiserver/facades/controller/caasunitprovisioner/provisioner.go Outdated Show resolved Hide resolved
apiserver/facades/controller/caasunitprovisioner/provisioner.go Outdated Show resolved Hide resolved
apiserver/facades/controller/caasunitprovisioner/provisioner_test.go Outdated Show resolved Hide resolved
caas/kubernetes/provider/k8s.go Outdated Show resolved Hide resolved
state/application.go Show resolved Hide resolved
state/cloudservice.go Show resolved Hide resolved
state/cloudservice.go Outdated Show resolved Hide resolved
state/cloudservice.go Outdated Show resolved Hide resolved
worker/caasunitprovisioner/application_worker.go Outdated Show resolved Hide resolved
@ycliuhw ycliuhw force-pushed the fix/caas-relation-datebag-inconsistency branch 2 times, most recently from 7306dc6 to 8c83a17 Compare June 7, 2019 09:11
@ycliuhw ycliuhw force-pushed the fix/caas-relation-datebag-inconsistency branch from 8c83a17 to 94cdabf Compare June 7, 2019 10:41
@ycliuhw
Copy link
Member Author

ycliuhw commented Jun 7, 2019

$$merge$$

@jujubot jujubot merged commit 779d0d8 into juju:2.6 Jun 7, 2019
@ycliuhw ycliuhw deleted the fix/caas-relation-datebag-inconsistency branch June 7, 2019 12:00
@achilleasa achilleasa mentioned this pull request Jun 7, 2019
Merged
jujubot added a commit that referenced this pull request Jun 7, 2019
@jujubot
Merge pull request #10298 from achilleasa/merge-2.6-to-develop
840d222 
#10298

# Description of change

Merges 2.6 -> develop

#10287 from wallyworld/k8s-operator-notfound-app
#10270 from ycliuhw/fix/caas-relation-datebag-inconsistency
#10297 from achilleasa/bundle-trust-acceptance-test
@ycliuhw ycliuhw restored the fix/caas-relation-datebag-inconsistency branch June 9, 2019 14:04
@ycliuhw ycliuhw deleted the fix/caas-relation-datebag-inconsistency branch June 9, 2019 15:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wallyworld wallyworld wallyworld approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ycliuhw @wallyworld @jujubot