OpenStack Compute (nova)

Merge lp:~sleepsonthefloor/nova/716847 into lp:~hudson-openstack/nova/trunk

  1. 716847
  2. Merge into trunk
Proposed by Anthony Young
Status: Merged
Approved by: Soren Hansen
Approved revision: 670
Merged at revision: 682
Proposed branch: lp:~sleepsonthefloor/nova/716847
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 17 lines (+7/-0)
1 file modified
bin/nova-manage (+7/-0)
To merge this branch: bzr merge lp:~sleepsonthefloor/nova/716847
Reviewer Review Type Date Requested Status
Vish Ishaya (community) Approve
Devin Carlen (community) Approve
Review via email: mp+49689@code.launchpad.net

Description of the change

Fix for bug #716847

If a volume has not yet been assigned to a host, then have "nova-manage volume delete" delete from database and skip the rpc.

To post a comment you must log in.
Revision history for this message
Devin Carlen (devcamcar) wrote :

yay

review: Approve
Revision history for this message
Vish Ishaya (vishvananda) wrote :

lgtm. We could probably use one of these for instances as well.

review: Approve
Revision history for this message
OpenStack Infra (hudson-openstack) wrote :
Download full text (75.5 KiB)

The attempt to merge lp:~sleepsonthefloor/nova/716847 into lp:nova failed. Below is the output from the failed tests.

/tmp/tmpXLEj1s
uid=108(jenkins) gid=65534(nogroup) groups=65534(nogroup)
AdminAPITest
    test_admin_disabled ok
    test_admin_enabled ok
APITest
    test_exceptions_are_converted_to_faults ok
Test
    test_authorize_token ok
    test_authorize_user ok
    test_bad_token ok
    test_bad_user ok
    test_no_user ok
    test_token_expiry ok
TestLimiter
    test_authorize_token ok
TestFaults
    test_fault_parts ok
    test_raise ok
    test_retry_header ok
FlavorsTest
    test_get_flavor_by_id ok
    test_get_flavor_list ok
GlanceImageServiceTest
    test_create ok
    test_create_and_show_non_existing_image ok
    test_delete ok
    test_update ok
ImageControllerWithGlanceServiceTest
    test_get_image_details ok
    test_get_image_index ok
LocalImageServiceTest
    test_create ok
    test_create_and_show_non_existing_image ok
    test_delete ok
    test_update ok
LimiterTest
    test_minute ok
    test_one_per_period ok
    test_second ok
    test_users_get_separate_buckets ok
    test_we_can_go_indefinitely_if_we_spread_out_requests ok
WSGIAppProxyTest
    test_200 ok
    test_403 ok
    test_failure ok
WSGIAppTest
    test_escaping ok
    test_good_urls ok
    test_invalid_methods ok
    test_invalid_urls ok
    test_response_to_delays ok
ServersTest
    test_create_backup_schedules ok
    test_create_instance ok
    test_delete_backup_schedules ok
    test_delete_server_instance o...

Revision history for this message
OpenStack Infra (hudson-openstack) wrote :
Download full text (68.1 KiB)

The attempt to merge lp:~sleepsonthefloor/nova/716847 into lp:nova failed. Below is the output from the failed tests.

/tmp/tmpDuMBRt
uid=108(jenkins) gid=65534(nogroup) groups=65534(nogroup)
AdminAPITest
    test_admin_disabled ok
    test_admin_enabled ok
APITest
    test_exceptions_are_converted_to_faults ok
Test
    test_authorize_token ok
    test_authorize_user ok
    test_bad_token ok
    test_bad_user ok
    test_no_user ok
    test_token_expiry ok
TestLimiter
    test_authorize_token ok
TestFaults
    test_fault_parts ok
    test_raise ok
    test_retry_header ok
FlavorsTest
    test_get_flavor_by_id ok
    test_get_flavor_list ok
GlanceImageServiceTest
    test_create ok
    test_create_and_show_non_existing_image ok
    test_delete ok
    test_update ok
ImageControllerWithGlanceServiceTest
    test_get_image_details ok
    test_get_image_index ok
LocalImageServiceTest
    test_create ok
    test_create_and_show_non_existing_image ok
    test_delete ok
    test_update ok
LimiterTest
    test_minute ok
    test_one_per_period ok
    test_second ok
    test_users_get_separate_buckets ok
    test_we_can_go_indefinitely_if_we_spread_out_requests ok
WSGIAppProxyTest
    test_200 ok
    test_403 ok
    test_failure ok
WSGIAppTest
    test_escaping ok
    test_good_urls ok
    test_invalid_methods ok
    test_invalid_urls ok
    test_response_to_delays ok
ServersTest
    test_create_backup_schedules ok
    test_create_instance ok
    test_delete_backup_schedules ok
    test_delete_server_instance o...

Revision history for this message
OpenStack Infra (hudson-openstack) wrote :
Download full text (75.5 KiB)

The attempt to merge lp:~sleepsonthefloor/nova/716847 into lp:nova failed. Below is the output from the failed tests.

/tmp/tmpKl9u8N
uid=108(jenkins) gid=65534(nogroup) groups=65534(nogroup)
AdminAPITest
    test_admin_disabled ok
    test_admin_enabled ok
APITest
    test_exceptions_are_converted_to_faults ok
Test
    test_authorize_token ok
    test_authorize_user ok
    test_bad_token ok
    test_bad_user ok
    test_no_user ok
    test_token_expiry ok
TestLimiter
    test_authorize_token ok
TestFaults
    test_fault_parts ok
    test_raise ok
    test_retry_header ok
FlavorsTest
    test_get_flavor_by_id ok
    test_get_flavor_list ok
GlanceImageServiceTest
    test_create ok
    test_create_and_show_non_existing_image ok
    test_delete ok
    test_update ok
ImageControllerWithGlanceServiceTest
    test_get_image_details ok
    test_get_image_index ok
LocalImageServiceTest
    test_create ok
    test_create_and_show_non_existing_image ok
    test_delete ok
    test_update ok
LimiterTest
    test_minute ok
    test_one_per_period ok
    test_second ok
    test_users_get_separate_buckets ok
    test_we_can_go_indefinitely_if_we_spread_out_requests ok
WSGIAppProxyTest
    test_200 ok
    test_403 ok
    test_failure ok
WSGIAppTest
    test_escaping ok
    test_good_urls ok
    test_invalid_methods ok
    test_invalid_urls ok
    test_response_to_delays ok
ServersTest
    test_create_backup_schedules ok
    test_create_instance ok
    test_delete_backup_schedules ok
    test_delete_server_instance o...

Revision history for this message
Soren Hansen (soren) wrote :

https://code.launchpad.net/~soren/nova/fix-unittest/+merge/49788
should fix this failing test.

--
Soren Hansen        | http://linux2go.dk/
Ubuntu Developer    | http://www.ubuntu.com/
OpenStack Developer | http://www.openstack.org/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/nova-manage'
--- bin/nova-manage 2011-01-26 21:58:24 +0000
+++ bin/nova-manage 2011-02-14 18:52:50 +0000
@@ -579,6 +579,13 @@
579 ctxt = context.get_admin_context()579 ctxt = context.get_admin_context()
580 volume = db.volume_get(ctxt, param2id(volume_id))580 volume = db.volume_get(ctxt, param2id(volume_id))
581 host = volume['host']581 host = volume['host']
582
583 if not host:
584 print "Volume not yet assigned to host."
585 print "Deleting volume from database and skipping rpc."
586 db.volume_destroy(ctxt, param2id(volume_id))
587 return
588
582 if volume['status'] == 'in-use':589 if volume['status'] == 'in-use':
583 print "Volume is in-use."590 print "Volume is in-use."
584 print "Detach volume from instance and then try again."591 print "Detach volume from instance and then try again."