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.

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

bugfix (CollaSet): pod creation error is not thrown out #37

Merged
merged 2 commits into from
Aug 21, 2023

Conversation

wu8685
Copy link
Collaborator

@wu8685 wu8685 commented Aug 18, 2023

1. Does this PR affect any open issues?(Y/N) and add issue references (e.g. "fix #123", "re #123".):

  • N
  • Y

2. What is the scope of this PR (e.g. component or file name):

fix bug in creation process of CollaSet

3. Provide a description of the PR(e.g. more details, effects, motivations or doc link):

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Other

4. Are there any breaking changes?(Y/N) and describe the breaking changes(e.g. more details, motivations or doc link):

  • N
  • Y

5. Are there test cases for these changes?(Y/N) select and add more details, references or doc links:

  • Unit test
  • Integration test
  • Benchmark (add benchmark stats below)
  • Manual test (add detailed scripts or steps below)
  • Other

6. Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

No need to add release note

@wu8685 wu8685 self-assigned this Aug 18, 2023
@wu8685 wu8685 added the kind/bug Something isn't working label Aug 18, 2023
@@ -170,7 +170,7 @@ func (sc *RealSyncControl) Scale(set *appsv1alpha1.CollaSet, podWrappers []*coll
newPod.Labels[appsv1alpha1.PodInstanceIDLabelKey] = fmt.Sprintf("%d", availableIDContext.ID)

klog.V(1).Info("try to create Pod with revision %s from CollaSet %s/%s", revision.Name, set.Namespace, set.Name)
if pod, err := sc.podControl.CreatePod(newPod); err == nil {
if pod, err = sc.podControl.CreatePod(newPod); err == nil {
Copy link
Collaborator

Choose a reason for hiding this comment

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

can we simplify code to following format

if err := fn1(); err != nil {
	return err
}

if err := fn2(); err != nil {
	return err
}

so the code should be

if pod, err = createPod(); err != nil {
	return err
}
// created
if err = expectCreate(); err != nil {
	return err
}

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

fixed

@wu8685 wu8685 merged commit f9cb738 into main Aug 21, 2023
5 checks passed
@wu8685 wu8685 deleted the bugfix-err-toleration branch August 21, 2023 07:07
@github-actions github-actions bot locked and limited conversation to collaborators Aug 21, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
kind/bug Something isn't working operating
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants