Skip to content

Version 0.4.1 Storage Pull #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gcheng merged 12 commits into from
Mar 9, 2013
Merged

Version 0.4.1 Storage Pull #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
38b3a52
[JXSCL] : Make OperationContext RequestResults thread safe,
Feb 20, 2013
f5e7c15
CR Feedback - Update tasks to provide result affinity. Now the Reque…
Feb 21, 2013
118bac1
Make BlobOutputStream use latest instead of uncommitted.
Feb 21, 2013
08648cc
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-j…
Feb 22, 2013
11b1a31
CR feedback: Update tasks to provide result affinity
Feb 25, 2013
782319d
CR feedback remove extra line
Feb 27, 2013
cba4c0d
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-j…
Feb 27, 2013
c5345f2
Merge branch 'dev' of https://github.com/sozler/azure-sdk-for-java in…
Feb 28, 2013
57335fe
Update Changelog for latest fixes
Feb 28, 2013
927e31e
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-j…
Mar 1, 2013
557804b
Merge branch 'dev' of https://github.com/sozler/azure-sdk-for-java in…
Mar 1, 2013
6ad950a
Merge branch 'release' of https://github.com/WindowsAzure/azure-sdk-f…
Mar 8, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ChangeLog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
2013.02.22 Version 0.4.1
* BlobOutputStream now commits block list using LATEST instead of UNCOMMITTED
* Added RequestResult to StorageEvents
* Fixed race condition when accessing OperationContext RequestResults
* Fixed the return value of BlobInputStream.read
* Fixed CloudPageBlob.downloadPageRanges to retrieve the blob length
* Fixed MD5 validation in BlobInputStream
Expand Down
2 changes: 1 addition & 1 deletion ...e-api/src/main/java/com/microsoft/windowsazure/services/blob/client/BlobOutputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ private synchronized void dispatchWrite(final int writeLength) throws IOExceptio
if (this.streamType == BlobType.BLOCK_BLOB) {
final CloudBlockBlob blobRef = (CloudBlockBlob) this.parentBlobRef;
final String blockID = Base64.encode(Utility.getBytesFromLong(this.blockIdSequenceNumber++));
this.blockList.add(new BlockEntry(blockID, BlockSearchMode.UNCOMMITTED));
this.blockList.add(new BlockEntry(blockID, BlockSearchMode.LATEST));

worker = new Callable<Void>() {
@Override
Expand Down
42 changes: 20 additions & 22 deletions ...ft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/client/CloudBlob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ public String execute(final CloudBlobClient client, final CloudBlob blob, final

client.getCredentials().signRequest(request, 0L);

this.setResult(ExecutionEngine.processRequest(request, opContext));
ExecutionEngine.processRequest(request, opContext, this.getResult());

if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_CREATED) {
this.setNonExceptionedRetryableFailure(true);
Expand Down Expand Up @@ -410,7 +410,7 @@ public Long execute(final CloudBlobClient client, final CloudBlob blob, final Op

client.getCredentials().signRequest(request, 0L);

this.setResult(ExecutionEngine.processRequest(request, opContext));
ExecutionEngine.processRequest(request, opContext, this.getResult());

if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_ACCEPTED) {
this.setNonExceptionedRetryableFailure(true);
Expand Down Expand Up @@ -544,7 +544,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op
BlobRequest.addMetadata(request, blob.metadata, opContext);
client.getCredentials().signRequest(request, 0);

this.setResult(ExecutionEngine.processRequest(request, opContext));
ExecutionEngine.processRequest(request, opContext, this.getResult());

if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_ACCEPTED) {
this.setNonExceptionedRetryableFailure(true);
Expand Down Expand Up @@ -623,7 +623,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op

client.getCredentials().signRequest(request, 0);

this.setResult(ExecutionEngine.processRequest(request, opContext));
ExecutionEngine.processRequest(request, opContext, this.getResult());

if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_ACCEPTED) {
this.setNonExceptionedRetryableFailure(true);
Expand Down Expand Up @@ -698,7 +698,7 @@ public CloudBlob execute(final CloudBlobClient client, final CloudBlob blob,

client.getCredentials().signRequest(request, 0L);

this.setResult(ExecutionEngine.processRequest(request, opContext));
ExecutionEngine.processRequest(request, opContext, this.getResult());

if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_CREATED) {
this.setNonExceptionedRetryableFailure(true);
Expand Down Expand Up @@ -787,7 +787,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op

client.getCredentials().signRequest(request, -1L);

this.setResult(ExecutionEngine.processRequest(request, opContext));
ExecutionEngine.processRequest(request, opContext, this.getResult());

if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_ACCEPTED) {
this.setNonExceptionedRetryableFailure(true);
Expand Down Expand Up @@ -878,7 +878,7 @@ public Boolean execute(final CloudBlobClient client, final CloudBlob blob, final

client.getCredentials().signRequest(request, -1L);

this.setResult(ExecutionEngine.processRequest(request, opContext));
ExecutionEngine.processRequest(request, opContext, this.getResult());

if (this.getResult().getStatusCode() == HttpURLConnection.HTTP_ACCEPTED) {
return true;
Expand Down Expand Up @@ -961,8 +961,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op
blobOptions.getTimeoutIntervalInMs(), blob.snapshotID, accessCondition, blobOptions, opContext);

client.getCredentials().signRequest(request, -1L);
final InputStream streamRef = ExecutionEngine.getInputStream(request, opContext);
this.setResult(opContext.getLastResult());
final InputStream streamRef = ExecutionEngine.getInputStream(request, opContext, this.getResult());

final String contentMD5 = request.getHeaderField(Constants.HeaderConstants.CONTENT_MD5);
final Boolean validateMD5 = !blobOptions.getDisableContentMD5Validation()
Expand Down Expand Up @@ -1015,8 +1014,8 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op
if ((ex.getHttpStatusCode() == Constants.HeaderConstants.HTTP_UNUSED_306 && !ex.getErrorCode().equals(
StorageErrorCodeStrings.OUT_OF_RANGE_INPUT))
|| ex.getHttpStatusCode() == HttpURLConnection.HTTP_PRECON_FAILED
|| !dummyPolicy.shouldRetry(0, opContext.getLastResult().getStatusCode(),
(Exception) ex.getCause(), opContext).isShouldRetry()) {
|| !dummyPolicy.shouldRetry(0, impl.getResult().getStatusCode(), (Exception) ex.getCause(),
opContext).isShouldRetry()) {
opContext.setIntermediateMD5(null);
throw ex;
}
Expand Down Expand Up @@ -1141,7 +1140,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op

client.getCredentials().signRequest(request, -1L);

this.setResult(ExecutionEngine.processRequest(request, opContext));
ExecutionEngine.processRequest(request, opContext, this.getResult());

if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_OK) {
this.setNonExceptionedRetryableFailure(true);
Expand Down Expand Up @@ -1298,8 +1297,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op

client.getCredentials().signRequest(request, -1L);

final InputStream sourceStream = ExecutionEngine.getInputStream(request, opContext);
this.setResult(opContext.getLastResult());
final InputStream sourceStream = ExecutionEngine.getInputStream(request, opContext, this.getResult());

int totalRead = 0;
int nextRead = buffer.length - bufferOffset;
Expand Down Expand Up @@ -1435,7 +1433,7 @@ public Boolean execute(final CloudBlobClient client, final CloudBlob blob, final

client.getCredentials().signRequest(request, -1L);

this.setResult(ExecutionEngine.processRequest(request, opContext));
ExecutionEngine.processRequest(request, opContext, this.getResult());

if (this.getResult().getStatusCode() == HttpURLConnection.HTTP_OK) {
final BlobAttributes retrievedAttributes = BlobResponse.getAttributes(request, blob.getUri(),
Expand Down Expand Up @@ -1922,7 +1920,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op

client.getCredentials().signRequest(request, 0L);

this.setResult(ExecutionEngine.processRequest(request, opContext));
ExecutionEngine.processRequest(request, opContext, this.getResult());

if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_OK) {
this.setNonExceptionedRetryableFailure(true);
Expand Down Expand Up @@ -2002,7 +2000,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op

client.getCredentials().signRequest(request, 0L);

this.setResult(ExecutionEngine.processRequest(request, opContext));
ExecutionEngine.processRequest(request, opContext, this.getResult());

if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_OK) {
this.setNonExceptionedRetryableFailure(true);
Expand Down Expand Up @@ -2091,7 +2089,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op

client.getCredentials().signRequest(request, 0L);

this.setResult(ExecutionEngine.processRequest(request, opContext));
ExecutionEngine.processRequest(request, opContext, this.getResult());

if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_OK) {
this.setNonExceptionedRetryableFailure(true);
Expand Down Expand Up @@ -2218,7 +2216,7 @@ public Long execute(final CloudBlobClient client, final CloudBlob blob, final Op

client.getCredentials().signRequest(request, 0L);

this.setResult(ExecutionEngine.processRequest(request, opContext));
ExecutionEngine.processRequest(request, opContext, this.getResult());

if (this.getResult().getStatusCode() == HttpURLConnection.HTTP_CONFLICT) {
final StorageException potentialConflictException = StorageException.translateException(request,
Expand Down Expand Up @@ -2368,7 +2366,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op
HttpURLConnection.HTTP_FORBIDDEN, null, null);
}

this.setResult(ExecutionEngine.processRequest(request, opContext));
ExecutionEngine.processRequest(request, opContext, this.getResult());

if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_CREATED) {
this.setNonExceptionedRetryableFailure(true);
Expand Down Expand Up @@ -2442,7 +2440,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op
BlobRequest.addMetadata(request, blob.metadata, opContext);
client.getCredentials().signRequest(request, 0L);

this.setResult(ExecutionEngine.processRequest(request, opContext));
ExecutionEngine.processRequest(request, opContext, this.getResult());

if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_OK) {
this.setNonExceptionedRetryableFailure(true);
Expand Down Expand Up @@ -2516,7 +2514,7 @@ public Void execute(final CloudBlobClient client, final CloudBlob blob, final Op
BlobRequest.addMetadata(request, blob.metadata, opContext);
client.getCredentials().signRequest(request, 0L);

this.setResult(ExecutionEngine.processRequest(request, opContext));
ExecutionEngine.processRequest(request, opContext, this.getResult());

if (this.getResult().getStatusCode() != HttpURLConnection.HTTP_OK) {
this.setNonExceptionedRetryableFailure(true);
Expand Down
2 changes: 1 addition & 1 deletion ...re-api/src/main/java/com/microsoft/windowsazure/services/blob/client/CloudBlobClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ ResultSegment<CloudBlobContainer> listContainersCore(final String prefix,

this.getCredentials().signRequest(listContainerRequest, -1L);

taskReference.setResult(ExecutionEngine.processRequest(listContainerRequest, opContext));
ExecutionEngine.processRequest(listContainerRequest, opContext, taskReference.getResult());

if (taskReference.getResult().getStatusCode() != HttpURLConnection.HTTP_OK) {
taskReference.setNonExceptionedRetryableFailure(true);
Expand Down
Loading