Update Fork #1

DK101010 · 2020-11-16T15:17:38Z

Description

Types of changes

[] Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)

Screenshots (if appropriate):

How Has This Been Tested?

It is not common, but HTTP requests can fail due to connection issues. In order to mitigate such situations and also improve logging, this PR enhances the Redfish request handling by adding an execution flow for re-trying HTTP requests; the retry happens only if the global settings redfish.retries is set to 1 or more retries; default is of 2 (two). One can disable the retries by setting redfish.retries to 0 (zero).

…4321) * Add hardware version to worker VM * Added worker VM hardware version when creating a template from a volume and migrating a detached volume * Add null parameter back that was removed by merge

* changes for supporting Citrix Hypervisor product name Signed-off-by: Abhishek Kumar <[email protected]>

#4389) * Fixed vm-templates not being removed from primary storage with storage garbage collection * Update vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java Co-authored-by: sureshanaparti <[email protected]> * Var name Co-authored-by: sureshanaparti <[email protected]>

We should have the metrics for the hosts which are dedicated to certain domains. We should also be able to see cpu/memory/storage currently used per domain > How Has This Been Tested? Enable prometheus server Add 127.0.0.1 as allowed Ip so that you can fetch metrics from prometheus Now fetch the endpoint # http http://127.0.0.1:9595/metrics | grep cloudstack_host_is_dedicated cloudstack_host_is_dedicated{zone="mgt122-10",hostname="node11",ip="10.13.122.11"} 1 # http http://127.0.0.1:9595/metrics | grep cloudstack_host_dedicated_to_account cloudstack_host_dedicated_to_account{zone="mgt122-10",hostname="node11",ip="10.13.122.11"} 1

…4366) If the resource state of hypervisor in "Maintenance" then it should be considered as offline even though the agent state is "Up". Since its in maintenance mode, it cant be used to allocate VM's and hence can't be considered towards resource allocation

Co-authored-by: Pearl Dsilva <[email protected]>

… vm.serviceoffering.ram.size.max (#4379) vm.serviceoffering.cpu.cores.max and vm.serviceoffering.ram.size.max

…o cloudstack-agent (#4382)

…heus exporter (#4383) * Hosts are counted twice if it has multiple host tags in Prometheus exporter * Import HostVO and inject HostDao

Signed-off-by: Abhishek Kumar <[email protected]>

…#4377)

Co-authored-by: Rodrigo <[email protected]>

* support for handling incremental snaps (on DB entries) on xen * Addressed comments * Update NfsSecondaryStorageResource.java adjusted space in comment/ log Co-authored-by: Pearl Dsilva <[email protected]>

The default GC algorithm G1 that is enabled by default with Java11 serves well on multiprocessor machines with large amount of memory where GC is probablistic with low pauses, where response time is more important than throughput and GC is kept shorter. The CloudStack management server is largely a multi-threaded server application that handles and orchestrates several network requests, and has the default max. heap size of only 2G that can be considered a small/medium application from a heap size perspective. Perhaps a more aggresive GC algorithm such as ParallelGC as used in Java8 and before (that is previous CloudStack releases) would serve better for throughput and cause more aggresive GC. Reference: https://docs.oracle.com/en/java/javase/11/gctuning/available-collectors.html#GUID-13943556-F521-4287-AAAA-AE5DE68777CD Signed-off-by: Rohit Yadav <[email protected]>

…bm sdk

Co-authored-by: Rakesh Venkatesh <[email protected]>

#4442)

…lates (#4437)

Co-authored-by: Pearl Dsilva <[email protected]>

Co-authored-by: Daan Hoogland <[email protected]>

For Basic network isolation methods are not provided, and exception is thrown when trying to encode the Vlan id. That's why we have to check before encoding that the list with isolation methods is not empty

Update template to return information to the documentation

…4469) Co-authored-by: Pearl Dsilva <[email protected]>

DaanHoogland · 2020-12-16T12:07:40Z

@DK101010 ,

I think you will want to get master from origin and force push it here. define or redefine origin as the apache cloudstack repo and define yours as "mine" or "dk" or something. makes sense?

DK101010 · 2020-12-16T14:45:59Z

Hi Dahn, at first, I have forked the apache/cloudstack into my projects via GitHub, after this I cloned my forked repository. Last month, I merged apache/cloudstack master into my fork via GitHub with a pull request. Then we talked together about it yesterday and you means that is not so good. For this reason I've added the apache/cloudstack into my remote repository mit git remote add ... and pulled into my forked master Now I want to find out if this correct, the result can you see here ( apache#4548) [image: image.png] it this a better solution? The only one that I know to prevent a merge commit is to use rebase, but a rebase of apache master to my forked master sounds not pretty well. Many Greetings Dirk Am Mi., 16. Dez. 2020 um 13:07 Uhr schrieb dahn <[email protected]>:

…

@DK101010 <https://github.com/DK101010> , [image: image] <https://user-images.githubusercontent.com/2486961/102346654-7ded8480-3f9f-11eb-9179-4f37e75d39df.png> I think you will want to get master from origin and force push it here. define or redefine origin as the apache cloudstack repo and define yours as "mine" or "dk" or something. makes sense? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#1 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ANW3U4UFYQIUBH6IGJIGRODSVCPJXANCNFSM4TXJLANA> .

DaanHoogland · 2020-12-16T15:00:10Z

so what are the output of git remote -v, and git branch -v?

DK101010 · 2020-12-16T15:33:22Z

[image: image.png] Am Mi., 16. Dez. 2020 um 16:00 Uhr schrieb dahn <[email protected]>:

…

so what are the output of git remote -v, and git branch -v? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#1 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ANW3U4XB2CNZJGGRDQ35FDDSVDDQXANCNFSM4TXJLANA> .

DaanHoogland · 2020-12-16T15:44:31Z

[image: image.png]

is not the text i was looking for :D

DaanHoogland · 2020-12-16T15:45:18Z

better not use github with mail. it doesn't work that well

DK101010 · 2020-12-16T15:59:44Z

sorry :D
next try

DaanHoogland · 2020-12-17T08:04:31Z

Ah I should have said git branch -vv
an snippet from my output:

* marvin3                  3e228ea390 [sb/marvin3] env run of python3
  master                   58a0a7b1a3 [origin/master] Merge remote-tracking branch 'origin/4.14'

it shows how master is from origin (tracking origin/master) and marvin3 in on my company account (alias sb). marvin3 was a fork of master but pushed to a different account. next I created a pull request on github from shapeblue:marvin3 to apache:master and if i kept my local master up to date all is dandy and fine.
Your master is showing 78 ahead, that can't be good. I would sugest:

git branch -D master
git checkout -b master apache/master

the first line is destructive! I would also not name your own origin but something like mine or DK or so.

DK101010 · 2020-12-17T08:31:59Z

Ahh ok, I understand what you want and approved my assumption. My master should pointed to the apache/cloudstack master and not to my forked master. I will remove my master add the apache/cloudstack master, clean up my newest branch, merge the new master in this branch and then should be the problem solved.

I let you know when I pushed my updated branch, ok?

Many thanks for your support :)

DK101010 · 2020-12-17T12:45:17Z

@DaanHoogland Now looks good https://github.com/apache/cloudstack/pull/4548/commits

DaanHoogland · 2020-12-17T13:41:37Z

yes, it does

This fixes Travis to run basic UI checks for job #1 Signed-off-by: Rohit Yadav <[email protected]>

rohityadavcloud and others added 30 commits September 29, 2020 14:33

Merge remote-tracking branch 'origin/4.14'

b3bafff

createaccountcmd: Improving account param description (#4354)

cde7fbf

VMware: match hardware version for worker VM when taking a snapshot (#…

479ef8a

…4321) * Add hardware version to worker VM * Added worker VM hardware version when creating a template from a volume and migrating a detached volume * Add null parameter back that was removed by merge

hypervisor: Add Citrix Hypervisor 8x product name support (#4271)

d3be14d

* changes for supporting Citrix Hypervisor product name Signed-off-by: Abhishek Kumar <[email protected]>

Fixing searchAndCount searchAndDistinctCount when sc is null (#4374)

aab8df0

server: Fix some cpuspeed issues while create service offering (#4376)

94f9f89

List VMs by Security Group & HA (#4397)

2e32a3a

Merge branch '4.14'

b65282e

scripts: creates /var/run/cloud folder for creation of lock file (#4373)

cdcc914

Co-authored-by: Pearl Dsilva <[email protected]>

server: Add global configuration vm.serviceoffering.cpu.cores.max and…

2acd87c

… vm.serviceoffering.ram.size.max (#4379) vm.serviceoffering.cpu.cores.max and vm.serviceoffering.ram.size.max

debian/control: add uuid-runtime to cloudstack-common, ufw/apparmor t…

40724e6

…o cloudstack-agent (#4382)

plugins: Host is counted twice if it has multiple host tags in Promet…

55f0703

…heus exporter (#4383) * Hosts are counted twice if it has multiple host tags in Prometheus exporter * Import HostVO and inject HostDao

api: Making id a required field in scalekubernetesclustercmd (#4404)

16bb053

vmware: use hotPlugMemoryIncrementSize only for valid value (#4348)

5b419b9

Signed-off-by: Abhishek Kumar <[email protected]>

Merge remote-tracking branch 'origin/4.14'

d6db476

Dont add host back after agent service restart (#4228)

6c88e9a

kvm: fix wrong VM CPU usage (#4381)

be5df8d

server: fix issue that vm guest os type is reset after updatetemplate (…

f7a3701

…#4377)

Merge branch '4.14'

644731e

Re-add affinity group (#4405)

4c936b4

Handle with VM snapshot events (#4251)

d676ffa

Co-authored-by: Rodrigo <[email protected]>

enable update tags on disk offerings (#4194)

c222d0b

support for data migration of incremental snaps on xen (#4395)

0d487fc

* support for handling incremental snaps (on DB entries) on xen * Addressed comments * Update NfsSecondaryStorageResource.java adjusted space in comment/ log Co-authored-by: Pearl Dsilva <[email protected]>

Merge remote-tracking branch 'origin/4.14'

db3fdf4

Initial commit adding few required managed object classes and added p…

0701dc9

…bm sdk

demarey and others added 17 commits November 3, 2020 18:13

deps: fix pbm url download (#4440)

fdafc3c

FIX issue in VR if remote access vpn is enabled (#4430)

3414656

Co-authored-by: Rakesh Venkatesh <[email protected]>

Merge branch '4.14'

ffc42b9

Added compress option to dnsmasq log files (#4439)

88762c1

Preventing port 53 being added as lb rule when dns service is availab… (

9a253c4

#4442)

Merge branch '4.14'

a8b4d9d

[Bug fix] VMware: Fix for SSVM recreation on deployasis systemVM temp…

63fbbe7

…lates (#4437)

Re-enable IP address usage hiding (#4327)

5f8289f

Create Event in case of OOBM failure (#4418)

823111d

Returning nic details in KubernetesClusterResponse (#4456)

45f7b33

fix login issue post upgrade (#4465)

fb78fb2

Co-authored-by: Pearl Dsilva <[email protected]>

default teardown methods with reversed() handling (#4289)

a348afe

Co-authored-by: Daan Hoogland <[email protected]>

Fix IndexOutOfBoundsException when creating basic network (#4464)

cc8bee7

For Basic network isolation methods are not provided, and exception is thrown when trying to encode the Vlan id. That's why we have to check before encoding that the list with isolation methods is not empty

Merge branch '4.13' into 4.14

db3c12d

Merge branch '4.14'

79e46f5

Update PULL_REQUEST_TEMPLATE.md

deff74c

Update template to return information to the documentation

Fix: Listing projects comprising of only the user's on listAll=true (#…

7f408ec

…4469) Co-authored-by: Pearl Dsilva <[email protected]>

DK101010 merged commit 611fc43 into NDBSGMS:master Nov 16, 2020

DK101010 pushed a commit that referenced this pull request Apr 1, 2021

ui: travis fix post apache/cloudstack-primate merge

b07816b

This fixes Travis to run basic UI checks for job #1 Signed-off-by: Rohit Yadav <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Update Fork #1

Update Fork #1

Uh oh!

DK101010 commented Nov 16, 2020

Uh oh!

DaanHoogland commented Dec 16, 2020

Uh oh!

DK101010 commented Dec 16, 2020 via email

Uh oh!

DaanHoogland commented Dec 16, 2020

Uh oh!

DK101010 commented Dec 16, 2020 via email

Uh oh!

DaanHoogland commented Dec 16, 2020

Uh oh!

DaanHoogland commented Dec 16, 2020

Uh oh!

DK101010 commented Dec 16, 2020

Uh oh!

DaanHoogland commented Dec 17, 2020

Uh oh!

DK101010 commented Dec 17, 2020

Uh oh!

DK101010 commented Dec 17, 2020

Uh oh!

DaanHoogland commented Dec 17, 2020

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

20 participants

Update Fork #1

Update Fork #1

Uh oh!

Conversation

DK101010 commented Nov 16, 2020

Description

Types of changes

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

DaanHoogland commented Dec 16, 2020

Uh oh!

DK101010 commented Dec 16, 2020 via email

Uh oh!

DaanHoogland commented Dec 16, 2020

Uh oh!

DK101010 commented Dec 16, 2020 via email

Uh oh!

DaanHoogland commented Dec 16, 2020

Uh oh!

DaanHoogland commented Dec 16, 2020

Uh oh!

DK101010 commented Dec 16, 2020

Uh oh!

DaanHoogland commented Dec 17, 2020

Uh oh!

DK101010 commented Dec 17, 2020

Uh oh!

DK101010 commented Dec 17, 2020

Uh oh!

DaanHoogland commented Dec 17, 2020

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

20 participants