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

Followup fix for #1162: Add support for not (re)starting server after cloud-setup-management. #1330

Closed
wants to merge 1 commit into from
Closed

Conversation

ProjectMoon
Copy link

This is a follow-up fix for pull request #1162, which added a --no-start option to cloudstack-setup-management. It is necessary for further script execution under systemd, otherwise the service aborts.

if self.syscfg.env.noStart == False:
self.syscfg.svo.stopService("cloudstack-management")
Copy link
Contributor

Choose a reason for hiding this comment

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

so if nostart is false (start is true ??) the service is stopped. Am I understanding this wrong? it seems like we don't want this here and not unconditionally either but only if nostart is true.

Copy link
Author

Choose a reason for hiding this comment

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

This is the original behavior of the script, before --no-start was added. When --no-start is NOT specified, the script tries to make sure that the service is stopped before starting it again.

@davidamorimcruz
Copy link

LGTM, this change fixes the logic regarding the expected state of the service prior to running the script.

@DaanHoogland
Copy link
Contributor

complaining about a license, false positive: server/test/com/cloud/event/ActionEventUtilsTest.java

@DaanHoogland
Copy link
Contributor

LGTM, pinging @remibergsma

@remibergsma
Copy link
Contributor

2xLGTM, no test results. Did anyone verify this works?

@DaanHoogland
Copy link
Contributor

@remibergsma @ProjectMoon did himself, as I read it. This is a systemd installation script it won't be touched by the integration tests. You are not satisfied with this?

@remibergsma
Copy link
Contributor

@DaanHoogland This is not systemd, this is a python script to configure management. Why don't we build an environment and try this script with its parameters. Even if there's no integration test, we should still test/verify the changes IMHO.

@DaanHoogland
Copy link
Contributor

I know, I said 'systemd install script'. I am not taking the time to test this now. I can ask @davidamorimfaria . David?

@ProjectMoon
Copy link
Author

Perhaps I can make a small example test that starts cloudstack-setup-management under systemd with both --no-start and without it, showing the difference in behavior (i.e. working vs deadlock)?

@rohityadavcloud
Copy link
Member

LGTM, let's merge after some tests

It will only run the stop command when --no-start is specified.
@ProjectMoon
Copy link
Author

PR updated to latest 4.6.

@ProjectMoon
Copy link
Author

Also, forgot I was making a test case for this. Will update my agenda to get this done.

@bvbharatk
Copy link
Contributor

Link to logs Folder (search by build_no): https://www.dropbox.com/sh/yj3wnzbceo9uef2/AAB6u-Iap-xztdm6jHX9SjPja?dl=0

ACS CI BVT Run

Sumarry:
Build Number 127
Hypervisor xenserver
NetworkType Advanced
Passed=104
Failed=2
Skipped=4

Failed tests:

  • integration.smoke.test_guest_vlan_range.TestDedicateGuestVlanRange
    • test_dedicateGuestVlanRange Failing since 2 runs
  • integration.smoke.test_volumes.TestCreateVolume
    • test_06_download_detached_volume Failing since 2 runs

Skipped tests:
test_vm_nic_adapter_vmxnet3
test_deploy_vgpu_enabled_vm
test_06_copy_template
test_06_copy_iso

Passed test suits:
integration.smoke.test_deploy_vm_with_userdata.TestDeployVmWithUserData
integration.smoke.test_affinity_groups_projects.TestDeployVmWithAffinityGroup
integration.smoke.test_portable_publicip.TestPortablePublicIPAcquire
integration.smoke.test_over_provisioning.TestUpdateOverProvision
integration.smoke.test_global_settings.TestUpdateConfigWithScope
integration.smoke.test_scale_vm.TestScaleVm
integration.smoke.test_service_offerings.TestCreateServiceOffering
integration.smoke.test_loadbalance.TestLoadBalance
integration.smoke.test_routers.TestRouterServices
integration.smoke.test_reset_vm_on_reboot.TestResetVmOnReboot
integration.smoke.test_snapshots.TestSnapshotRootDisk
integration.smoke.test_deploy_vms_with_varied_deploymentplanners.TestDeployVmWithVariedPlanners
integration.smoke.test_network.TestDeleteAccount
integration.smoke.test_non_contigiousvlan.TestUpdatePhysicalNetwork
integration.smoke.test_deploy_vm_iso.TestDeployVMFromISO
integration.smoke.test_public_ip_range.TestDedicatePublicIPRange
integration.smoke.test_multipleips_per_nic.TestDeployVM
integration.smoke.test_regions.TestRegions
integration.smoke.test_affinity_groups.TestDeployVmWithAffinityGroup
integration.smoke.test_network_acl.TestNetworkACL
integration.smoke.test_pvlan.TestPVLAN
integration.smoke.test_ssvm.TestSSVMs
integration.smoke.test_nic.TestNic
integration.smoke.test_deploy_vm_root_resize.TestDeployVM
integration.smoke.test_resource_detail.TestResourceDetail
integration.smoke.test_secondary_storage.TestSecStorageServices
integration.smoke.test_vm_life_cycle.TestDeployVM
integration.smoke.test_disk_offerings.TestCreateDiskOffering

@kiwiflyer
Copy link
Contributor

Team,

Where are we currently on this PR?

@ProjectMoon
Copy link
Author

Right now I suppose I still need to make a unit test. And I guess also re-open against 4.7.

@rohityadavcloud
Copy link
Member

@ProjectMoon thanks, please open against master; unlikely we'll do 4.7.x 4.8.x releases

@swill
Copy link
Contributor

swill commented May 2, 2016

We are still accepting bug fixes in 4.7 and 4.8, but all features should be added to master. Anything merged into 4.7 or 4.8 will be forward merged up through master. I agree, this probably should be opened against master.

@ProjectMoon
Copy link
Author

Closing to open against master.

@ProjectMoon ProjectMoon deleted the pr-fix-mgmt-setup branch May 26, 2016 11:31
asfgit pushed a commit that referenced this pull request Dec 7, 2016
[CLOUDSTACK-9645] Followup fix for #1162: Add support for not (re)starting server after cloud-setup-management.New version against #1330, opened against master.

```
Moving stop of management in config inside if statement.

It will only run the stop command when --no-start is specified.
```

* pr/1566:
  CLOUDSTACK-9645: Moving stop of management in config inside if statement.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants