-
Notifications
You must be signed in to change notification settings - Fork 63
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support the Size limitation in the InMemory cache. (#1070)
* Tested Reject eviction mode set as default. Signed-off-by: Jakub Balhar <[email protected]> * Move the sizing of the InMemory on the per record size Signed-off-by: Jakub Balhar <[email protected]> * Test the reject eviction strategy in the integration tests Signed-off-by: Jakub Balhar <[email protected]> * The preparations for the other eviction strategies Signed-off-by: Jakub Balhar <[email protected]> * Clean code smells Signed-off-by: Jakub Balhar <[email protected]> Co-authored-by: Jakub Balhar <[email protected]>
- Loading branch information
1 parent
12b60ab
commit e3aff47
Showing
7 changed files
with
166 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
100 changes: 100 additions & 0 deletions
100
integration-tests/src/test/java/org/zowe/apiml/cachingservice/RejectEvictionTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| /* | ||
| * This program and the accompanying materials are made available under the terms of the | ||
| * Eclipse Public License v2.0 which accompanies this distribution, and is available at | ||
| * https://www.eclipse.org/legal/epl-v20.html | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Copyright Contributors to the Zowe Project. | ||
| */ | ||
| package org.zowe.apiml.cachingservice; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonCreator; | ||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
| import io.restassured.RestAssured; | ||
| import lombok.Data; | ||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.zowe.apiml.gatewayservice.SecurityUtils; | ||
| import org.zowe.apiml.util.categories.NotForMainframeTest; | ||
| import org.zowe.apiml.util.http.HttpRequestUtils; | ||
|
|
||
| import java.net.URI; | ||
|
|
||
| import static io.restassured.RestAssured.given; | ||
| import static io.restassured.http.ContentType.JSON; | ||
| import static org.apache.http.HttpStatus.SC_CREATED; | ||
| import static org.apache.http.HttpStatus.SC_INSUFFICIENT_STORAGE; | ||
| import static org.hamcrest.core.Is.is; | ||
|
|
||
| @NotForMainframeTest // Remove later when implemented for VSAM as well. | ||
| class RejectEvictionTest { | ||
| private static final URI CACHING_PATH = HttpRequestUtils.getUriFromGateway("/cachingservice/api/v1/cache"); | ||
| private final static String COOKIE_NAME = "apimlAuthenticationToken"; | ||
| private static String jwtToken = SecurityUtils.gatewayToken(); | ||
|
|
||
| @BeforeAll | ||
| static void setup() { | ||
| RestAssured.useRelaxedHTTPSValidation(); | ||
| } | ||
|
|
||
| @Test | ||
| void givenStorageIsFull_whenAnotherKeyIsInserted_thenItIsRejected() { | ||
| int amountOfAllowedRecords = 100; | ||
| try { | ||
| KeyValue keyValue; | ||
|
|
||
| // The default configuration is to allow 100 records. | ||
| for (int i = 0; i < amountOfAllowedRecords; i++) { | ||
| keyValue = new KeyValue("key" + i, "testValue"); | ||
| create(keyValue); | ||
| } | ||
|
|
||
| keyValue = new KeyValue("keyThatWontPass", "testValue"); | ||
| given() | ||
| .contentType(JSON) | ||
| .body(keyValue) | ||
| .cookie(COOKIE_NAME, jwtToken) | ||
| .when() | ||
| .post(CACHING_PATH) | ||
| .then() | ||
| .statusCode(is(SC_INSUFFICIENT_STORAGE)); | ||
| } finally { | ||
| for (int i = 0; i < amountOfAllowedRecords; i++) { | ||
| deteleValueUnderServiceIdWithoutValidation("key" + i, jwtToken); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void create(KeyValue keyValue) { | ||
| given() | ||
| .contentType(JSON) | ||
| .body(keyValue) | ||
| .cookie(COOKIE_NAME, jwtToken) | ||
| .when() | ||
| .post(CACHING_PATH) | ||
| .then() | ||
| .statusCode(is(SC_CREATED)); | ||
| } | ||
|
|
||
| private static void deteleValueUnderServiceIdWithoutValidation(String value, String jwtToken) { | ||
| given() | ||
| .contentType(JSON) | ||
| .cookie(COOKIE_NAME, jwtToken) | ||
| .when() | ||
| .delete(CACHING_PATH + "/" + value); | ||
| } | ||
|
|
||
| @JsonInclude(JsonInclude.Include.NON_EMPTY) | ||
| @Data | ||
| private static class KeyValue { | ||
| private final String key; | ||
| private final String value; | ||
|
|
||
| @JsonCreator | ||
| public KeyValue(String key, String value) { | ||
| this.key = key; | ||
| this.value = value; | ||
| } | ||
| } | ||
| } |