Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

CIRCLE / cloud

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 94
  • Merge Requests 10
  • Pipelines
  • Wiki
  • Snippets
  • Members
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Merged
Merge request !399 opened Sep 27, 2018 by Chif Gergő@chif.gergo 
  • Report abuse
Report abuse

Node list error

#509

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b node_list_error origin/node_list_error

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff node_list_error

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 2
  • Commits 7
  • Pipelines 5
  • Changes 2
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Czémán Arnold
    @cemiarni started a discussion on an old version of the diff Sep 27, 2018
    Last updated by Chif Gergő Sep 30, 2018
    circle/dashboard/views/node.py
    210 210 return super(NodeList, self).get(*args, **kwargs)
    211 211
    212 212 def get_queryset(self):
    213 self.wrong_nodes_message()
    213 214 return Node.objects.annotate(
    214 215 number_of_VMs=Count('instance_set')).select_related('host')
    215 216
    217 def wrong_nodes_message(self):
    218 wrong_nodes = ''
    • Czémán Arnold @cemiarni commented Sep 27, 2018
      Master

      Maybe it could be done with a list and join.

      Maybe it could be done with a list and join.
    • Chif Gergő @chif.gergo

      changed this line in version 2 of the diff

      Sep 30, 2018

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://git.ik.bme.hu/circle/cloud/merge_requests/399/diffs?diff_id=695&start_sha=0a580d1dba378adbbdf67017ba5e7ccc358c4323#f2b78ad69d4962fb4fb58b593d6c161916d015e1_218_218)
      Toggle commit list
    Please register or sign in to reply
  • Czémán Arnold
    @cemiarni started a discussion on the diff Sep 27, 2018
    circle/vm/models/node.py
    363 363 def driver_version(self):
    364 364 return self.info.get('driver_version')
    365 365
    366 def get_monitor_info(self, metric):
    367 # return with the metric value if the monitor info not none
    368 # or return 0 if its None or the metric unreachable
    • Czémán Arnold @cemiarni commented Sep 27, 2018
      Master

      Please log these as warning! You can also show an alert message to the user.

      Please log these as warning! You can also show an alert message to the user.
    Please register or sign in to reply
  • Chif Gergő @chif.gergo

    added 1 commit

    • 5b6f9cc1 - Modify wrong nodes message function, logging infos of monitor info

    Compare with previous version

    Sep 30, 2018

    added 1 commit

    • 5b6f9cc1 - Modify wrong nodes message function, logging infos of monitor info

    Compare with previous version

    added 1 commit * 5b6f9cc1 - Modify wrong nodes message function, logging infos of monitor info [Compare with previous version](https://git.ik.bme.hu/circle/cloud/merge_requests/399/diffs?diff_id=695&start_sha=0a580d1dba378adbbdf67017ba5e7ccc358c4323)
    Toggle commit list
  • Chif Gergő @chif.gergo

    added 1 commit

    • 0646721b - Fix linter warnings

    Compare with previous version

    Sep 30, 2018

    added 1 commit

    • 0646721b - Fix linter warnings

    Compare with previous version

    added 1 commit * 0646721b - Fix linter warnings [Compare with previous version](https://git.ik.bme.hu/circle/cloud/merge_requests/399/diffs?diff_id=696&start_sha=5b6f9cc100e7da68e9045f9d13376ce968d23dae)
    Toggle commit list
  • Turcsik Máté @mtturcsik

    merged

    Jan 11, 2019

    merged

    merged
    Toggle commit list
  • Turcsik Máté @mtturcsik

    mentioned in commit 40175563

    Jan 11, 2019

    mentioned in commit 40175563

    mentioned in commit 401755637b91f3f7c16b70bb95cbb96523201753
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
4
4 participants
Reference: circle/cloud!399
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.