~kirkland/+junk/eucalyptus

« back to all changes in this revision

Viewing changes to clc/modules/image-manager/src/main/java/com/eucalyptus/images/util/StorageUtil.java

  • Committer: Dustin Kirkland
  • Date: 2010-03-29 17:41:16 UTC
  • mfrom: (444.57.18 1.6.2)
  • Revision ID: kirkland@x200-20100329174116-tq47srpxneynd2gi
* Cherry-pick merge from upstream 1.6.2, now on revision 1217
  - LP: #534877 - fix potential db connection leak when no
    default kernel/ramdisk set
  - LP: #534868 - update expiration deadline
  - LP: #534869 - correct misleading error message
  - LP: #437026 - fix auth failures due to timezone
  - LP: #535335 - fix display of failed volumes
  - LP: #537058 - fix creation of large numbers of volumes
  - LP: #538604 - remember storage stats across sc restarts
  - LP: #547059 - fix euca-describe-snapshots
  - LP: #544992 - fix get-all-keys

Show diffs side-by-side

added added

removed removed

Lines of Context:
116
116
      aVolume.setStatus( v.mapState( ) );
117
117
      aVolume.getAttachmentSet().add( attachedVolumes.get( aVolume.getVolumeId() ) );
118
118
    }
119
 
    if ( "invalid".equals( v.getRemoteDevice( ) ) ) {
 
119
    if ( "invalid".equals( v.getRemoteDevice( ) ) && !State.FAIL.equals( v.getState( ) ) ) {
120
120
      aVolume.setStatus( "creating" );
121
121
    }
122
122
    return aVolume;