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.

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

add health check endpoint to config api #1135

Merged
merged 4 commits into from
Dec 1, 2020
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
26 changes: 25 additions & 1 deletion airbyte-api/src/main/openapi/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ tags:
description: Connection between sources and destinations.
- name: web_backend
description: Connection between sources and destinations.
- name: health
description: Healthchecks

paths:
/v1/workspaces/get:
Expand Down Expand Up @@ -914,7 +916,21 @@ paths:
$ref: "#/components/schemas/DebugRead"
"404":
description: Debug info not found

/v1/health:
get:
tags:
- health
summary: Health Check
operationId: getHealthCheck
responses:
"200":
description: Successful operation
content:
application/json:
schema:
$ref: "#/components/schemas/HealthCheckRead"
"404":
description: Debug info not found
components:
securitySchemes:
bearerAuth:
Expand Down Expand Up @@ -1618,6 +1634,14 @@ components:
type: array
items:
type: string
# Health
HealthCheckRead:
type: object
required:
- db
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small thing but just db is vague, maybe db_healthy

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is how we did it for unblocker. why the change of heart? will it be clearer when we add other attributes or less clear?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably more clear -- I'm good with it either way but it saves the 1 second of mental mapping from db to db_healthy in my head

properties:
db:
type: boolean
# General
CheckConnectionRead:
type: object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import io.airbyte.api.model.DestinationReadList;
import io.airbyte.api.model.DestinationRecreate;
import io.airbyte.api.model.DestinationUpdate;
import io.airbyte.api.model.HealthCheckRead;
import io.airbyte.api.model.JobIdRequestBody;
import io.airbyte.api.model.JobInfoRead;
import io.airbyte.api.model.JobListRequestBody;
Expand Down Expand Up @@ -75,6 +76,7 @@
import io.airbyte.server.handlers.DebugInfoHandler;
import io.airbyte.server.handlers.DestinationDefinitionsHandler;
import io.airbyte.server.handlers.DestinationHandler;
import io.airbyte.server.handlers.HealthCheckHandler;
import io.airbyte.server.handlers.JobHistoryHandler;
import io.airbyte.server.handlers.SchedulerHandler;
import io.airbyte.server.handlers.SourceDefinitionsHandler;
Expand Down Expand Up @@ -105,6 +107,7 @@ public class ConfigurationApi implements io.airbyte.api.V1Api {
private final WebBackendConnectionsHandler webBackendConnectionsHandler;
private final WebBackendSourceHandler webBackendSourceHandler;
private final WebBackendDestinationHandler webBackendDestinationHandler;
private final HealthCheckHandler healthCheckHandler;

public ConfigurationApi(final ConfigRepository configRepository, final SchedulerPersistence schedulerPersistence, final SpecCache specCache) {
final JsonSchemaValidator schemaValidator = new JsonSchemaValidator();
Expand All @@ -121,6 +124,7 @@ public ConfigurationApi(final ConfigRepository configRepository, final Scheduler
webBackendSourceHandler = new WebBackendSourceHandler(sourceHandler, schedulerHandler);
webBackendDestinationHandler = new WebBackendDestinationHandler(destinationHandler, schedulerHandler);
debugInfoHandler = new DebugInfoHandler(configRepository);
healthCheckHandler = new HealthCheckHandler(configRepository);
}

// WORKSPACE
Expand Down Expand Up @@ -332,6 +336,12 @@ public DebugRead getDebuggingInfo() {
return execute(debugInfoHandler::getInfo);
}

// HEALTH
@Override
public HealthCheckRead getHealthCheck() {
return healthCheckHandler.health();
}

// WEB BACKEND

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/*
* MIT License
*
* Copyright (c) 2020 Airbyte
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

package io.airbyte.server.handlers;

import io.airbyte.api.model.HealthCheckRead;
import io.airbyte.config.persistence.ConfigRepository;
import io.airbyte.config.persistence.PersistenceConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class HealthCheckHandler {

private static final Logger LOGGER = LoggerFactory.getLogger(HealthCheckHandler.class);

private final ConfigRepository configRepository;

public HealthCheckHandler(ConfigRepository configRepository) {
this.configRepository = configRepository;
}

// todo (cgardens) - add more checks as we go.
public HealthCheckRead health() {
boolean databaseHealth = false;
try {
databaseHealth = configRepository.getStandardWorkspace(PersistenceConstants.DEFAULT_WORKSPACE_ID) != null;
} catch (Exception e) {
LOGGER.error("database health check failed.");
}

return new HealthCheckRead().db(databaseHealth);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/*
* MIT License
*
* Copyright (c) 2020 Airbyte
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

package io.airbyte.server.handlers;

import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

import io.airbyte.api.model.HealthCheckRead;
import io.airbyte.config.StandardWorkspace;
import io.airbyte.config.persistence.ConfigNotFoundException;
import io.airbyte.config.persistence.ConfigRepository;
import io.airbyte.config.persistence.PersistenceConstants;
import io.airbyte.validation.json.JsonValidationException;
import java.io.IOException;
import org.junit.jupiter.api.Test;

class HealthCheckHandlerTest {

@Test
void testDbHealth() throws ConfigNotFoundException, IOException, JsonValidationException {
final ConfigRepository configRepository = mock(ConfigRepository.class);
final HealthCheckHandler healthCheckHandler = new HealthCheckHandler(configRepository);

// check db healthy
when(configRepository.getStandardWorkspace(PersistenceConstants.DEFAULT_WORKSPACE_ID)).thenReturn(new StandardWorkspace());
assertEquals(new HealthCheckRead().db(true), healthCheckHandler.health());

// check db unhealthy
when(configRepository.getStandardWorkspace(PersistenceConstants.DEFAULT_WORKSPACE_ID)).thenReturn(null);
assertEquals(new HealthCheckRead().db(false), healthCheckHandler.health());

doThrow(IOException.class).when(configRepository.getStandardWorkspace(PersistenceConstants.DEFAULT_WORKSPACE_ID));
assertEquals(new HealthCheckRead().db(false), healthCheckHandler.health());
}

}