From 158a725985dd3470748b5dabd7dd530d52c26214 Mon Sep 17 00:00:00 2001 From: fjy Date: Sun, 26 Jan 2014 20:07:09 +0800 Subject: [PATCH] fix backwards compat issues --- ...ackwardsCompatibleCoordinatorResource.java | 62 +++++++++++++++++++ .../http/BackwardsCompatibleInfoResource.java | 1 + .../java/io/druid/cli/CliCoordinator.java | 2 + 3 files changed, 65 insertions(+) create mode 100644 server/src/main/java/io/druid/server/http/BackwardsCompatibleCoordinatorResource.java diff --git a/server/src/main/java/io/druid/server/http/BackwardsCompatibleCoordinatorResource.java b/server/src/main/java/io/druid/server/http/BackwardsCompatibleCoordinatorResource.java new file mode 100644 index 00000000000..ccccdaf0f13 --- /dev/null +++ b/server/src/main/java/io/druid/server/http/BackwardsCompatibleCoordinatorResource.java @@ -0,0 +1,62 @@ +/* + * Druid - a distributed column store. + * Copyright (C) 2012, 2013 Metamarkets Group Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +package io.druid.server.http; + +import com.google.inject.Inject; +import io.druid.server.coordinator.DruidCoordinator; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.Response; + +/** + */ +@Deprecated +@Path("/druid/coordinator") +public class BackwardsCompatibleCoordinatorResource +{ + private final DruidCoordinator coordinator; + + @Inject + public BackwardsCompatibleCoordinatorResource( + DruidCoordinator coordinator + ) + { + this.coordinator = coordinator; + } + + @GET + @Path("/leader") + @Produces("application/json") + public Response getLeader() + { + return Response.ok(coordinator.getCurrentLeader()).build(); + } + + @GET + @Path("/loadstatus") + @Produces("application/json") + public Response getLoadStatus( + ) + { + return Response.ok(coordinator.getLoadStatus()).build(); + } +} \ No newline at end of file diff --git a/server/src/main/java/io/druid/server/http/BackwardsCompatibleInfoResource.java b/server/src/main/java/io/druid/server/http/BackwardsCompatibleInfoResource.java index ed1cf580887..6fce94bc493 100644 --- a/server/src/main/java/io/druid/server/http/BackwardsCompatibleInfoResource.java +++ b/server/src/main/java/io/druid/server/http/BackwardsCompatibleInfoResource.java @@ -31,6 +31,7 @@ import javax.ws.rs.Path; /** */ +@Deprecated @Path("/static/info") public class BackwardsCompatibleInfoResource extends InfoResource { diff --git a/services/src/main/java/io/druid/cli/CliCoordinator.java b/services/src/main/java/io/druid/cli/CliCoordinator.java index 0055c6a0a45..319ece9215f 100644 --- a/services/src/main/java/io/druid/cli/CliCoordinator.java +++ b/services/src/main/java/io/druid/cli/CliCoordinator.java @@ -43,6 +43,7 @@ import io.druid.guice.ManageLifecycle; import io.druid.server.coordinator.DruidCoordinator; import io.druid.server.coordinator.DruidCoordinatorConfig; import io.druid.server.coordinator.LoadQueueTaskMaster; +import io.druid.server.http.BackwardsCompatibleCoordinatorResource; import io.druid.server.http.BackwardsCompatibleInfoResource; import io.druid.server.http.CoordinatorDynamicConfigsResource; import io.druid.server.http.CoordinatorRedirectInfo; @@ -110,6 +111,7 @@ public class CliCoordinator extends ServerRunnable binder.bind(JettyServerInitializer.class).toInstance(new CoordinatorJettyServerInitializer()); Jerseys.addResource(binder, BackwardsCompatibleInfoResource.class); Jerseys.addResource(binder, InfoResource.class); + Jerseys.addResource(binder, BackwardsCompatibleCoordinatorResource.class); Jerseys.addResource(binder, CoordinatorResource.class); Jerseys.addResource(binder, CoordinatorDynamicConfigsResource.class); Jerseys.addResource(binder, TiersResource.class);