← Back to branch summary

~davewalker/ubuntu/maverick/eucalyptus/maverick_to_quilt

« back to all changes in this revision

Viewing changes to clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/StorageManager.java

  • Committer: Dustin Kirkland
  • Date: 2010-04-26 17:38:44 UTC
  • Revision ID: kirkland@x200-20100426173844-1rd5u5vmfc5h34wi
https://launchpad.net/bugs/565101
Cherry-pick upstream commit r1223..1226:
* clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/StorageManager.java,
  clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/fs/FileSystemStorageManager.java,
  clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusImageManager.java,
  clc/modules/walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/WalrusManager.java:
  - fix Walrus OOM errors (java heap), LP: #565101

Show diffs side-by-side

added added

removed removed

Lines of Context:
clc/modules/storage-common/src/main/java/edu/ucsb/eucalyptus/storage/StorageManager.java
74
74
import com.eucalyptus.util.EucalyptusCloudException;
75
75
 
76
76
import edu.ucsb.eucalyptus.cloud.BucketLogData;
 
77
import edu.ucsb.eucalyptus.msgs.WalrusDataGetRequestType;
77
78
import edu.ucsb.eucalyptus.storage.fs.FileIO;
78
79
 
79
80
public interface StorageManager {
114
115
 
115
116
    public long getObjectSize(String bucket, String object);
116
117
 
117
 
        public void sendObject(Channel channel, DefaultHttpResponse httpResponse, String bucketName, String objectName, 
 
118
        public void sendObject(WalrusDataGetRequestType request, DefaultHttpResponse httpResponse, String bucketName, String objectName, 
118
119
                        long size, String etag, String lastModified, String contentType, String contentDisposition, Boolean isCompressed, BucketLogData logData);
119
120
 
120
 
        public void sendObject(Channel channel, DefaultHttpResponse httpResponse, String bucketName, String objectName, 
 
121
        public void sendObject(WalrusDataGetRequestType request, DefaultHttpResponse httpResponse, String bucketName, String objectName, 
121
122
                        long start, long end, long size, String etag, String lastModified, String contentType, String contentDisposition, Boolean isCompressed, BucketLogData logData);
122
123
 
123
 
        public void sendHeaders(Channel channel, DefaultHttpResponse httpResponse, Long size, String etag,
 
124
        public void sendHeaders(WalrusDataGetRequestType request, DefaultHttpResponse httpResponse, Long size, String etag,
124
125
                        String lastModified, String contentType, String contentDisposition, BucketLogData logData);
125
126
        
126
127
    public void setRootDirectory(String rootDirectory);