-
Notifications
You must be signed in to change notification settings - Fork 901
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Bug]Fix internal server error when Bookkeeper HTTP services are sent…
… invalid values in json input
- Loading branch information
Apurva Telang
committed
Apr 18, 2023
1 parent
94e15b3
commit c034c22
Showing
9 changed files
with
422 additions
and
15 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
98 changes: 98 additions & 0 deletions
98
.../src/test/java/org/apache/bookkeeper/server/http/service/ResumeCompactionServiceTest.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,98 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.bookkeeper.server.http.service; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
|
|
||
| import java.util.Map; | ||
| import org.apache.bookkeeper.common.util.JsonUtil; | ||
| import org.apache.bookkeeper.http.HttpServer; | ||
| import org.apache.bookkeeper.http.service.HttpServiceRequest; | ||
| import org.apache.bookkeeper.http.service.HttpServiceResponse; | ||
| import org.apache.bookkeeper.test.BookKeeperClusterTestCase; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
|
|
||
| public class ResumeCompactionServiceTest extends BookKeeperClusterTestCase { | ||
|
|
||
| private static final int numberOfBookies = 1; | ||
| private SuspendCompactionService suspendCompactionService; | ||
| private ResumeCompactionService resumeCompactionService; | ||
|
|
||
| public ResumeCompactionServiceTest() { | ||
| super(numberOfBookies); | ||
| } | ||
|
|
||
| @Override | ||
| @Before | ||
| public void setUp() throws Exception { | ||
| super.setUp(); | ||
| resumeCompactionService = new ResumeCompactionService(serverByIndex(numBookies - 1)); | ||
| suspendCompactionService = new SuspendCompactionService(serverByIndex(numBookies - 1)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testResumeCompactionWithBadMajorAndMinorCompactArgs() throws Exception { | ||
| String triggerResumeBody = "{ \"resumeMajor\": \"true\", \"resumeMinor\": \"true\" }"; | ||
| HttpServiceRequest resumeRequest = new HttpServiceRequest(triggerResumeBody, HttpServer.Method.PUT, null); | ||
| HttpServiceResponse response = resumeCompactionService.handle(resumeRequest); | ||
| assertEquals(HttpServer.StatusCode.BAD_REQUEST.getValue(), response.getStatusCode()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testResumeCompactionWithBadMajorAndGoodMinorCompactArgs() throws Exception { | ||
| String triggerSuspendBody = "{ \"suspendMajor\": true, \"suspendMinor\": true }"; | ||
| String triggerResumeBody = "{ \"resumeMajor\": \"true\", \"resumeMinor\": true }"; | ||
| HttpServiceRequest suspendRequest = new HttpServiceRequest(triggerSuspendBody, HttpServer.Method.PUT, null); | ||
| suspendCompactionService.handle(suspendRequest); | ||
| Map beforeResumeStatusResponseMap = getCompactionStatus(); | ||
| assertEquals("true", beforeResumeStatusResponseMap.get("isMajorGcSuspended")); | ||
| assertEquals("true", beforeResumeStatusResponseMap.get("isMinorGcSuspended")); | ||
| HttpServiceRequest resumeRequest = new HttpServiceRequest(triggerResumeBody, HttpServer.Method.PUT, null); | ||
| HttpServiceResponse response = resumeCompactionService.handle(resumeRequest); | ||
| assertEquals(HttpServer.StatusCode.OK.getValue(), response.getStatusCode()); | ||
| Map afterResumeStatusResponseMap = getCompactionStatus(); | ||
| assertEquals("true", afterResumeStatusResponseMap.get("isMajorGcSuspended")); | ||
| assertEquals("false", afterResumeStatusResponseMap.get("isMinorGcSuspended")); | ||
| } | ||
|
|
||
| @Test | ||
| public void testResumeCompactionWithGoodMajorAndBadMinorCompactArgs() throws Exception { | ||
| String triggerSuspendBody = "{ \"suspendMajor\": true, \"suspendMinor\": true }"; | ||
| String triggerResumeBody = "{ \"resumeMajor\": true, \"resumeMinor\": \"true\" }"; | ||
| HttpServiceRequest suspendRequest = new HttpServiceRequest(triggerSuspendBody, HttpServer.Method.PUT, null); | ||
| suspendCompactionService.handle(suspendRequest); | ||
| Map beforeResumeStatusResponseMap = getCompactionStatus(); | ||
| assertEquals("true", beforeResumeStatusResponseMap.get("isMajorGcSuspended")); | ||
| assertEquals("true", beforeResumeStatusResponseMap.get("isMinorGcSuspended")); | ||
| HttpServiceRequest resumeRequest = new HttpServiceRequest(triggerResumeBody, HttpServer.Method.PUT, null); | ||
| HttpServiceResponse response = resumeCompactionService.handle(resumeRequest); | ||
| assertEquals(HttpServer.StatusCode.OK.getValue(), response.getStatusCode()); | ||
| Map afterResumeStatusResponseMap = getCompactionStatus(); | ||
| assertEquals("false", afterResumeStatusResponseMap.get("isMajorGcSuspended")); | ||
| assertEquals("true", afterResumeStatusResponseMap.get("isMinorGcSuspended")); | ||
| } | ||
|
|
||
| private Map getCompactionStatus() throws Exception { | ||
| HttpServiceRequest statusRequest = new HttpServiceRequest(null, HttpServer.Method.GET, null); | ||
| HttpServiceResponse statusResponse = suspendCompactionService.handle(statusRequest); | ||
| return JsonUtil.fromJson(statusResponse.getBody(), Map.class); | ||
| } | ||
|
|
||
| } |
94 changes: 94 additions & 0 deletions
94
...src/test/java/org/apache/bookkeeper/server/http/service/SuspendCompactionServiceTest.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,94 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.bookkeeper.server.http.service; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
|
|
||
| import java.util.Map; | ||
| import org.apache.bookkeeper.common.util.JsonUtil; | ||
| import org.apache.bookkeeper.http.HttpServer; | ||
| import org.apache.bookkeeper.http.service.HttpServiceRequest; | ||
| import org.apache.bookkeeper.http.service.HttpServiceResponse; | ||
| import org.apache.bookkeeper.test.BookKeeperClusterTestCase; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
|
|
||
| public class SuspendCompactionServiceTest extends BookKeeperClusterTestCase { | ||
|
|
||
| private static final int numberOfBookies = 1; | ||
| private SuspendCompactionService suspendCompactionService; | ||
|
|
||
| public SuspendCompactionServiceTest() { | ||
| super(numberOfBookies); | ||
| } | ||
|
|
||
| @Override | ||
| @Before | ||
| public void setUp() throws Exception { | ||
| super.setUp(); | ||
| suspendCompactionService = new SuspendCompactionService(serverByIndex(numBookies - 1)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testSuspendCompactionWithBadMajorAndMinorCompactArgs() throws Exception { | ||
| String testBody = "{ \"suspendMajor\": \"true\", \"suspendMinor\": \"true\" }"; | ||
| Map beforeStatusResponseMap = getCompactionStatus(); | ||
| assertEquals("false", beforeStatusResponseMap.get("isMajorGcSuspended")); | ||
| assertEquals("false", beforeStatusResponseMap.get("isMinorGcSuspended")); | ||
| HttpServiceRequest suspendRequest = new HttpServiceRequest(testBody, HttpServer.Method.PUT, null); | ||
| HttpServiceResponse response = suspendCompactionService.handle(suspendRequest); | ||
| assertEquals(HttpServer.StatusCode.BAD_REQUEST.getValue(), response.getStatusCode()); | ||
|
|
||
| } | ||
|
|
||
| @Test | ||
| public void testSuspendCompactionWithBadMajorAndGoodMinorCompactArgs() throws Exception { | ||
| String testBody = "{ \"suspendMajor\": \"true\", \"suspendMinor\": true }"; | ||
| Map beforeStatusResponseMap = getCompactionStatus(); | ||
| assertEquals("false", beforeStatusResponseMap.get("isMajorGcSuspended")); | ||
| assertEquals("false", beforeStatusResponseMap.get("isMinorGcSuspended")); | ||
| HttpServiceRequest suspendRequest = new HttpServiceRequest(testBody, HttpServer.Method.PUT, null); | ||
| HttpServiceResponse response = suspendCompactionService.handle(suspendRequest); | ||
| assertEquals(HttpServer.StatusCode.OK.getValue(), response.getStatusCode()); | ||
| Map afterStatusResponseMap = getCompactionStatus(); | ||
| assertEquals("false", afterStatusResponseMap.get("isMajorGcSuspended")); | ||
| assertEquals("true", afterStatusResponseMap.get("isMinorGcSuspended")); | ||
| } | ||
|
|
||
| @Test | ||
| public void testSuspendCompactionWithGoodMajorAndBadMinorCompactArgs() throws Exception { | ||
| String testBody = "{ \"suspendMajor\": true, \"suspendMinor\": \"true\" }"; | ||
| Map beforeStatusResponseMap = getCompactionStatus(); | ||
| assertEquals("false", beforeStatusResponseMap.get("isMajorGcSuspended")); | ||
| assertEquals("false", beforeStatusResponseMap.get("isMinorGcSuspended")); | ||
| HttpServiceRequest suspendRequest = new HttpServiceRequest(testBody, HttpServer.Method.PUT, null); | ||
| HttpServiceResponse response = suspendCompactionService.handle(suspendRequest); | ||
| assertEquals(HttpServer.StatusCode.OK.getValue(), response.getStatusCode()); | ||
| Map afterStatusResponseMap = getCompactionStatus(); | ||
| assertEquals("true", afterStatusResponseMap.get("isMajorGcSuspended")); | ||
| assertEquals("false", afterStatusResponseMap.get("isMinorGcSuspended")); | ||
| } | ||
|
|
||
| private Map getCompactionStatus() throws Exception { | ||
| HttpServiceRequest statusRequest = new HttpServiceRequest(null, HttpServer.Method.GET, null); | ||
| HttpServiceResponse statusResponse = suspendCompactionService.handle(statusRequest); | ||
| return JsonUtil.fromJson(statusResponse.getBody(), Map.class); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.