← Back to branch summary

~nurmi/eucalyptus/webuiversion

« back to all changes in this revision

Viewing changes to clc/modules/image-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/ImageManager.java

  • Committer: Dustin Kirkland
  • Date: 2009-10-14 04:31:08 UTC
  • mfrom: (444.16.2 1.6)
  • Revision ID: kirkland@canonical.com-20091014043108-hng571fdt37b6sv4
https://launchpad.net/bugs/450915
* Merge from upstream revision 931
* This snapshot is expected to fix the following bug:
  - LP: #450915 - fix issue with slow restoring of instances

Show diffs side-by-side

added added

removed removed

Lines of Context:
clc/modules/image-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/ImageManager.java
66
66
 
67
67
import com.google.common.collect.Lists;
68
68
import com.google.common.collect.Sets;
 
69
import com.eucalyptus.bootstrap.Component;
 
70
import com.eucalyptus.config.Configuration;
69
71
import com.eucalyptus.images.util.ImageUtil;
70
72
import com.eucalyptus.images.util.WalrusUtil;
71
73
import com.eucalyptus.util.EntityWrapper;
72
74
import com.eucalyptus.util.EucalyptusCloudException;
 
75
import com.eucalyptus.util.NetworkUtil;
73
76
import com.eucalyptus.ws.client.ServiceDispatcher;
74
77
 
75
78
import edu.ucsb.eucalyptus.cloud.VmAllocationInfo;
134
137
      db.rollback( );
135
138
    }
136
139
    VmImageInfo vmImgInfo = new VmImageInfo( vmInfo.getImageId( ), vmInfo.getKernelId( ), vmInfo.getRamdiskId( ), diskUrl, null, null, productCodes );
137
 
    ArrayList<String> ancestorIds = ImageUtil.getAncestors( vmInfo.getOwnerId( ), diskInfo.getImageLocation( ) );
138
 
    vmImgInfo.setAncestorIds( ancestorIds );
 
140
    if( Component.walrus.isLocal( ) ) {
 
141
      ArrayList<String> ancestorIds = ImageUtil.getAncestors( vmInfo.getOwnerId( ), diskInfo.getImageLocation( ) );
 
142
      vmImgInfo.setAncestorIds( ancestorIds );
 
143
    } else {//FIXME: handle populating these in a defered way for the remote case.
 
144
      vmImgInfo.setAncestorIds( new ArrayList<String>() );
 
145
    }
139
146
    return vmImgInfo;
140
147
  }
141
148