Can not delete stack when SNAPSHOT_IN_PROGRESS

[huangtianhua]

1. create a stack
2. make snapshot for stack
3. may be there is something wrong, the stack in SNAPSHOT_IN_PROGRESS for long time
4. to delete the stack
5. the stack in DELETE_IN_PROGRESS until timeout
6. the reason:
Traceback (most recent call last):
  File "/usr/local/lib/python2.7/dist-packages/eventlet/hubs/hub.py", line 457, in fire_timers
    timer()
  File "/usr/local/lib/python2.7/dist-packages/eventlet/hubs/timer.py", line 58, in __call__
    cb(*args, **kw)
  File "/usr/local/lib/python2.7/dist-packages/eventlet/greenthread.py", line 214, in main
    result = function(*args, **kwargs)
  File "/opt/stack/heat/heat/engine/service.py", line 110, in _start_with_trace
    return func(*args, **kwargs)
  File "/usr/local/lib/python2.7/dist-packages/osprofiler/profiler.py", line 105, in wrapper
    return f(*args, **kwargs)
  File "/opt/stack/heat/heat/engine/stack.py", line 1080, in delete
    self.delete_snapshot(snapshot)
  File "/usr/local/lib/python2.7/dist-packages/osprofiler/profiler.py", line 105, in wrapper
    return f(*args, **kwargs)
  File "/opt/stack/heat/heat/engine/stack.py", line 1184, in delete_snapshot
    data = snapshot.data['resources'].get(name)
TypeError: 'NoneType' object has no attribute '__getitem__'

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/168568

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/168568
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=42727797d379007ebddb51d96959b08c3c80cd9b
Submitter: Jenkins
Branch: master

commit 42727797d379007ebddb51d96959b08c3c80cd9b
Author: huangtianhua <email address hidden>
Date: Sat Mar 28 17:05:10 2015 +0800

    Make sure to delete stack when SNAPSHOT_IN_PROGRESS

    If there is no snapshot data, no need to start a task runner
    of rsrc.delete_snapshot.

    Change-Id: I1b868eda8a7a0a2ed5f30aa01a41f4c9820193a5
    Closes-Bug: #1437588

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/juno
Review: https://review.openstack.org/224915

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/224915
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=3a3b74ad1c01a2bb3b36b1d76280dd9857636340
Submitter: Jenkins
Branch: stable/juno

commit 3a3b74ad1c01a2bb3b36b1d76280dd9857636340
Author: huangtianhua <email address hidden>
Date: Sat Mar 28 17:05:10 2015 +0800

    Make sure to delete stack when SNAPSHOT_IN_PROGRESS

    If there is no snapshot data, no need to start a task runner
    of rsrc.delete_snapshot.

    Change-Id: I1b868eda8a7a0a2ed5f30aa01a41f4c9820193a5
    Closes-Bug: #1437588
    (cherry picked from commit 42727797d379007ebddb51d96959b08c3c80cd9b)