Skip to content
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

Jump to bottom

Fix empty reservation #12

Merged
merged 4 commits into from
Dec 13, 2021
Merged

Fix empty reservation #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1da135
Add tests to cover issue
sbckr Dec 13, 2021
76482c2
Add check to break loop through available tuple chunks
sbckr Dec 13, 2021
c045817
Apply code formatting rules
sbckr Dec 13, 2021
721abbe
Remove unused variable
sbckr Dec 13, 2021
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 ...vice/src/main/java/io/carbynestack/castor/service/download/CreateReservationSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ private List<ReservationElement> composeElements(TupleType tupleType, long numbe
new ReservationElement(
tupleChunkData.getTupleChunkId(), tuplesToRead, tupleChunkData.getReservedMarker()));
stillToReserve -= tuplesToRead;
if (stillToReserve == 0) {
break;
}
}
if (stillToReserve > 0) {
throw new CastorServiceException(
Expand Down
49 changes: 41 additions & 8 deletions .../src/test/java/io/carbynestack/castor/service/download/CreateReservationSupplierTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import io.carbynestack.castor.service.persistence.cache.ReservationCachingService;
import io.carbynestack.castor.service.persistence.markerstore.TupleChunkMetaDataEntity;
import io.carbynestack.castor.service.persistence.markerstore.TupleChunkMetaDataStorageService;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
import org.junit.Before;
import org.junit.Test;
Expand Down Expand Up @@ -111,21 +113,52 @@ public void givenSharingReservationFails_whenGet_thenThrowCastorServiceException
}

@Test
public void givenSuccessfulRequest_whenGet_thenReturnExpectedReservation() {
TupleChunkMetaDataEntity metaDataEntityMock = mock(TupleChunkMetaDataEntity.class);
UUID chunkId = UUID.fromString("c8a0a467-16b0-4f03-b7d7-07cbe1b0e7e8");
public void givenMultipleChunksWithAvailable_whenGet_thenReturnExpectedReservation() {
TupleChunkMetaDataEntity metaDataEntity1Mock = mock(TupleChunkMetaDataEntity.class);
TupleChunkMetaDataEntity metaDataEntity2Mock = mock(TupleChunkMetaDataEntity.class);
UUID chunk1Id = UUID.fromString("c8a0a467-16b0-4f03-b7d7-07cbe1b0e7e8");
long reservedMarker = 0;
ReservationElement expectedReservationElement =
new ReservationElement(chunkId, count, reservedMarker);
new ReservationElement(chunk1Id, count, reservedMarker);
Reservation expectedReservation =
new Reservation(reservationId, tupleType, singletonList(expectedReservationElement));

when(tupleChunkMetaDataStorageServiceMock.getAvailableTuples(tupleType)).thenReturn(count);
when(tupleChunkMetaDataStorageServiceMock.getTupleChunkData(tupleType))
.thenReturn(singletonList(metaDataEntityMock));
when(metaDataEntityMock.getTupleChunkId()).thenReturn(chunkId);
when(metaDataEntityMock.getReservedMarker()).thenReturn(reservedMarker);
when(metaDataEntityMock.getNumberOfTuples()).thenReturn(count);
.thenReturn(Arrays.asList(metaDataEntity1Mock, metaDataEntity2Mock));
when(metaDataEntity1Mock.getTupleChunkId()).thenReturn(chunk1Id);
when(metaDataEntity1Mock.getReservedMarker()).thenReturn(reservedMarker);
when(metaDataEntity1Mock.getNumberOfTuples()).thenReturn(count);
when(castorInterVcpClientMock.shareReservation(expectedReservation)).thenReturn(true);

assertEquals(expectedReservation, createReservationSupplier.get());
verify(reservationCachingServiceMock).keepReservation(expectedReservation);
}

@Test
public void
givenFirstChunkHasNotEnoughTuples_whenGet_thenCreateReservationReferencingMultipleChunks() {
TupleChunkMetaDataEntity metaDataEntity1Mock = mock(TupleChunkMetaDataEntity.class);
TupleChunkMetaDataEntity metaDataEntity2Mock = mock(TupleChunkMetaDataEntity.class);
UUID chunk1Id = UUID.fromString("c8a0a467-16b0-4f03-b7d7-07cbe1b0e7e8");
UUID chunk2Id = UUID.fromString("4d206204-96a0-4ddc-b409-4ac05b1f12f2");
long reservedMarker = 0;
List<ReservationElement> expectedReservationElements =
Arrays.asList(
new ReservationElement(chunk1Id, count - 1, reservedMarker),
new ReservationElement(chunk2Id, 1, reservedMarker));
Reservation expectedReservation =
new Reservation(reservationId, tupleType, expectedReservationElements);

when(tupleChunkMetaDataStorageServiceMock.getAvailableTuples(tupleType)).thenReturn(count);
when(tupleChunkMetaDataStorageServiceMock.getTupleChunkData(tupleType))
.thenReturn(Arrays.asList(metaDataEntity1Mock, metaDataEntity2Mock));
when(metaDataEntity1Mock.getTupleChunkId()).thenReturn(chunk1Id);
when(metaDataEntity1Mock.getReservedMarker()).thenReturn(reservedMarker);
when(metaDataEntity1Mock.getNumberOfTuples()).thenReturn(count - 1);
when(metaDataEntity2Mock.getTupleChunkId()).thenReturn(chunk2Id);
when(metaDataEntity2Mock.getReservedMarker()).thenReturn(reservedMarker);
when(metaDataEntity2Mock.getNumberOfTuples()).thenReturn(count);
when(castorInterVcpClientMock.shareReservation(expectedReservation)).thenReturn(true);

assertEquals(expectedReservation, createReservationSupplier.get());
Expand Down