You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/03/19 15:07:27 UTC
[09/19] incubator-brooklyn git commit: Decline requests for resources
relying on rebinded state in non HOT states
Decline requests for resources relying on rebinded state in non HOT states
No point in asking for applications when HA state is STANDBY. For example 404 response should mean that the resource doesn't exist, not that it's not loaded yet.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/35e6c3a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/35e6c3a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/35e6c3a5
Branch: refs/heads/master
Commit: 35e6c3a513ccad9f37425627214d8157f9480b04
Parents: 8343385
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Wed Mar 4 16:50:00 2015 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Mar 19 16:01:29 2015 +0200
----------------------------------------------------------------------
usage/jsgui/src/main/webapp/assets/js/router.js | 7 +-
.../brooklyn/launcher/BrooklynWebServer.java | 2 +
.../rest/filter/HaHotStateRequired.java | 28 ++++++
.../rest/filter/HaMasterCheckFilter.java | 2 +-
.../rest/filter/HaStateCheckResourceFilter.java | 98 ++++++++++++++++++++
.../rest/resources/ApplicationResource.java | 2 +
.../rest/resources/CatalogResource.java | 2 +
.../rest/resources/EffectorResource.java | 2 +
.../rest/resources/EntityConfigResource.java | 2 +
.../brooklyn/rest/resources/EntityResource.java | 2 +
.../rest/resources/LocationResource.java | 2 +
.../rest/resources/PolicyConfigResource.java | 2 +
.../brooklyn/rest/resources/PolicyResource.java | 2 +
.../brooklyn/rest/resources/SensorResource.java | 2 +
.../brooklyn/rest/BrooklynRestApiLauncher.java | 2 +
15 files changed, 154 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/35e6c3a5/usage/jsgui/src/main/webapp/assets/js/router.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/js/router.js b/usage/jsgui/src/main/webapp/assets/js/router.js
index 485af82..3e38841 100644
--- a/usage/jsgui/src/main/webapp/assets/js/router.js
+++ b/usage/jsgui/src/main/webapp/assets/js/router.js
@@ -89,7 +89,7 @@ define([
homePage:function (trail) {
var that = this;
// render the page after we fetch the collection -- no rendering on error
- this.applications.fetch({success:function () {
+ function render() {
var homeView = new HomeView({
collection:that.applications,
locations:that.locations,
@@ -97,6 +97,9 @@ define([
});
var veryFirstViewLoad = !that.currentView;
that.showView("#application-content", homeView);
+ }
+ this.applications.fetch({success:function () {
+ render();
// show add application wizard if none already exist and this is the first page load
if ((veryFirstViewLoad && trail=='auto' && that.applications.isEmpty()) ||
(trail=='add_application') ) {
@@ -106,7 +109,7 @@ define([
}
});
}
- }})
+ }, error: render});
},
applicationsPage:function (app, trail, tab) {
if (trail === undefined) trail = app
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/35e6c3a5/usage/launcher/src/main/java/brooklyn/launcher/BrooklynWebServer.java
----------------------------------------------------------------------
diff --git a/usage/launcher/src/main/java/brooklyn/launcher/BrooklynWebServer.java b/usage/launcher/src/main/java/brooklyn/launcher/BrooklynWebServer.java
index 8c9c9e3..d469152 100644
--- a/usage/launcher/src/main/java/brooklyn/launcher/BrooklynWebServer.java
+++ b/usage/launcher/src/main/java/brooklyn/launcher/BrooklynWebServer.java
@@ -321,6 +321,8 @@ public class BrooklynWebServer {
// Accept gzipped requests and responses, disable caching for dynamic content
config.getProperties().put(ResourceConfig.PROPERTY_CONTAINER_REQUEST_FILTERS, GZIPContentEncodingFilter.class.getName());
config.getProperties().put(ResourceConfig.PROPERTY_CONTAINER_RESPONSE_FILTERS, ImmutableList.of(GZIPContentEncodingFilter.class, NoCacheFilter.class));
+ // Checks if appropriate request given HA status
+ config.getProperties().put(ResourceConfig.PROPERTY_RESOURCE_FILTER_FACTORIES, brooklyn.rest.filter.HaStateCheckResourceFilter.class.getName());
// configure to match empty path, or any thing which looks like a file path with /assets/ and extension html, css, js, or png
// and treat that as static content
config.getProperties().put(ServletContainer.PROPERTY_WEB_PAGE_CONTENT_REGEX, "(/?|[^?]*/assets/[^?]+\\.[A-Za-z0-9_]+)");
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/35e6c3a5/usage/rest-server/src/main/java/brooklyn/rest/filter/HaHotStateRequired.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/filter/HaHotStateRequired.java b/usage/rest-server/src/main/java/brooklyn/rest/filter/HaHotStateRequired.java
new file mode 100644
index 0000000..271da8f
--- /dev/null
+++ b/usage/rest-server/src/main/java/brooklyn/rest/filter/HaHotStateRequired.java
@@ -0,0 +1,28 @@
+/*
+ * 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 brooklyn.rest.filter;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.TYPE})
+public @interface HaHotStateRequired {}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/35e6c3a5/usage/rest-server/src/main/java/brooklyn/rest/filter/HaMasterCheckFilter.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/filter/HaMasterCheckFilter.java b/usage/rest-server/src/main/java/brooklyn/rest/filter/HaMasterCheckFilter.java
index 2f40377..5267aba 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/filter/HaMasterCheckFilter.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/filter/HaMasterCheckFilter.java
@@ -42,7 +42,7 @@ import brooklyn.management.ha.ManagementNodeState;
*/
public class HaMasterCheckFilter implements Filter {
- private static final String SKIP_CHECK_HEADER = "Brooklyn-Allow-Non-Master-Access";
+ protected static final String SKIP_CHECK_HEADER = "Brooklyn-Allow-Non-Master-Access";
private static final Set<String> SAFE_STANDBY_METHODS = Sets.newHashSet("GET", "HEAD");
protected ManagementContext mgmt;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/35e6c3a5/usage/rest-server/src/main/java/brooklyn/rest/filter/HaStateCheckResourceFilter.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/filter/HaStateCheckResourceFilter.java b/usage/rest-server/src/main/java/brooklyn/rest/filter/HaStateCheckResourceFilter.java
new file mode 100644
index 0000000..44f1d1a
--- /dev/null
+++ b/usage/rest-server/src/main/java/brooklyn/rest/filter/HaStateCheckResourceFilter.java
@@ -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 brooklyn.rest.filter;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import javax.servlet.ServletContext;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import brooklyn.config.BrooklynServiceAttributes;
+import brooklyn.management.ManagementContext;
+import brooklyn.management.ha.ManagementNodeState;
+
+import com.google.common.collect.ImmutableSet;
+import com.sun.jersey.api.model.AbstractMethod;
+import com.sun.jersey.spi.container.ContainerRequest;
+import com.sun.jersey.spi.container.ContainerRequestFilter;
+import com.sun.jersey.spi.container.ContainerResponseFilter;
+import com.sun.jersey.spi.container.ResourceFilter;
+import com.sun.jersey.spi.container.ResourceFilterFactory;
+
+public class HaStateCheckResourceFilter implements ResourceFilterFactory {
+ private static final Set<ManagementNodeState> HOT_STATES = ImmutableSet.of(
+ ManagementNodeState.MASTER, ManagementNodeState.HOT_STANDBY, ManagementNodeState.HOT_BACKUP);
+
+ @Context
+ private ServletContext servletContext;
+
+ private static class MethodFilter implements ResourceFilter, ContainerRequestFilter {
+ private AbstractMethod am;
+ private ManagementContext mgmt;
+
+ public MethodFilter(AbstractMethod am, ManagementContext mgmt) {
+ this.am = am;
+ this.mgmt = mgmt;
+ }
+
+ @Override
+ public ContainerRequestFilter getRequestFilter() {
+ return this;
+ }
+
+ @Override
+ public ContainerResponseFilter getResponseFilter() {
+ return null;
+ }
+
+ @Override
+ public ContainerRequest filter(ContainerRequest request) {
+ boolean isHot = isHaHotStatus();
+ boolean isOverriden = "true".equalsIgnoreCase(request.getHeaderValue(HaMasterCheckFilter.SKIP_CHECK_HEADER));
+ if (!isHot && !isOverriden &&
+ (am.getAnnotation(HaHotStateRequired.class) != null ||
+ am.getResource().getAnnotation(HaHotStateRequired.class) != null)) {
+ Response response = Response.status(Response.Status.FORBIDDEN)
+ .type(MediaType.APPLICATION_JSON)
+ .entity("{\"error\":403,\"message\":\"Requests should be made to the master Brooklyn server\"}")
+ .build();
+ throw new WebApplicationException(response);
+ }
+ return request;
+ }
+
+ private boolean isHaHotStatus() {
+ ManagementNodeState state = mgmt.getHighAvailabilityManager().getNodeState();
+ return HOT_STATES.contains(state);
+ }
+
+ }
+
+ @Override
+ public List<ResourceFilter> create(AbstractMethod am) {
+ ManagementContext mgmt = (ManagementContext)servletContext.getAttribute(BrooklynServiceAttributes.BROOKLYN_MANAGEMENT_CONTEXT);
+ return Collections.<ResourceFilter>singletonList(new MethodFilter(am, mgmt));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/35e6c3a5/usage/rest-server/src/main/java/brooklyn/rest/resources/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/ApplicationResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/ApplicationResource.java
index c9f42ae..fbee750 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/ApplicationResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/ApplicationResource.java
@@ -69,6 +69,7 @@ import brooklyn.rest.domain.ApplicationSummary;
import brooklyn.rest.domain.EntitySpec;
import brooklyn.rest.domain.EntitySummary;
import brooklyn.rest.domain.TaskSummary;
+import brooklyn.rest.filter.HaHotStateRequired;
import brooklyn.rest.transform.ApplicationTransformer;
import brooklyn.rest.transform.EntityTransformer;
import brooklyn.rest.transform.TaskTransformer;
@@ -82,6 +83,7 @@ import com.google.common.base.Throwables;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.Iterables;
+@HaHotStateRequired
public class ApplicationResource extends AbstractBrooklynRestResource implements ApplicationApi {
private static final Logger log = LoggerFactory.getLogger(ApplicationResource.class);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/35e6c3a5/usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java
index baf25b7..7040f13 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java
@@ -51,6 +51,7 @@ import brooklyn.rest.api.CatalogApi;
import brooklyn.rest.domain.ApiError;
import brooklyn.rest.domain.CatalogEntitySummary;
import brooklyn.rest.domain.CatalogItemSummary;
+import brooklyn.rest.filter.HaHotStateRequired;
import brooklyn.rest.transform.CatalogTransformer;
import brooklyn.rest.util.WebResourceUtils;
import brooklyn.util.ResourceUtils;
@@ -70,6 +71,7 @@ import com.google.common.io.Files;
import com.sun.jersey.core.header.FormDataContentDisposition;
import com.wordnik.swagger.core.ApiParam;
+@HaHotStateRequired
public class CatalogResource extends AbstractBrooklynRestResource implements CatalogApi {
private static final Logger log = LoggerFactory.getLogger(CatalogResource.class);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/35e6c3a5/usage/rest-server/src/main/java/brooklyn/rest/resources/EffectorResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/EffectorResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/EffectorResource.java
index 1ee4cf4..2cfd8f6 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/EffectorResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/EffectorResource.java
@@ -42,6 +42,7 @@ import brooklyn.management.internal.EffectorUtils;
import brooklyn.rest.api.EffectorApi;
import brooklyn.rest.domain.EffectorSummary;
import brooklyn.rest.domain.SummaryComparators;
+import brooklyn.rest.filter.HaHotStateRequired;
import brooklyn.rest.transform.EffectorTransformer;
import brooklyn.rest.transform.TaskTransformer;
import brooklyn.rest.util.WebResourceUtils;
@@ -49,6 +50,7 @@ import brooklyn.util.exceptions.Exceptions;
import brooklyn.util.guava.Maybe;
import brooklyn.util.time.Time;
+@HaHotStateRequired
public class EffectorResource extends AbstractBrooklynRestResource implements EffectorApi {
private static final Logger log = LoggerFactory.getLogger(EffectorResource.class);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/35e6c3a5/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityConfigResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityConfigResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityConfigResource.java
index 8af5ab7..2c3ceb6 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityConfigResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityConfigResource.java
@@ -36,6 +36,7 @@ import brooklyn.event.basic.BasicConfigKey;
import brooklyn.management.entitlement.Entitlements;
import brooklyn.rest.api.EntityConfigApi;
import brooklyn.rest.domain.EntityConfigSummary;
+import brooklyn.rest.filter.HaHotStateRequired;
import brooklyn.rest.transform.EntityTransformer;
import brooklyn.rest.util.WebResourceUtils;
import brooklyn.util.flags.TypeCoercions;
@@ -46,6 +47,7 @@ import com.google.common.base.Predicates;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+@HaHotStateRequired
public class EntityConfigResource extends AbstractBrooklynRestResource implements EntityConfigApi {
private static final Logger LOG = LoggerFactory.getLogger(EntityConfigResource.class);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/35e6c3a5/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityResource.java
index 239139f..5572121 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityResource.java
@@ -53,6 +53,7 @@ import brooklyn.rest.api.EntityApi;
import brooklyn.rest.domain.EntitySummary;
import brooklyn.rest.domain.LocationSummary;
import brooklyn.rest.domain.TaskSummary;
+import brooklyn.rest.filter.HaHotStateRequired;
import brooklyn.rest.transform.EntityTransformer;
import brooklyn.rest.transform.LocationTransformer;
import brooklyn.rest.transform.LocationTransformer.LocationDetailLevel;
@@ -68,6 +69,7 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.io.Files;
+@HaHotStateRequired
public class EntityResource extends AbstractBrooklynRestResource implements EntityApi {
private static final Logger log = LoggerFactory.getLogger(EntityResource.class);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/35e6c3a5/usage/rest-server/src/main/java/brooklyn/rest/resources/LocationResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/LocationResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/LocationResource.java
index aa73215..8d7e3f6 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/LocationResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/LocationResource.java
@@ -37,6 +37,7 @@ import brooklyn.rest.api.LocationApi;
import brooklyn.rest.domain.LocationSpec;
import brooklyn.rest.domain.LocationSummary;
import brooklyn.rest.domain.SummaryComparators;
+import brooklyn.rest.filter.HaHotStateRequired;
import brooklyn.rest.transform.LocationTransformer;
import brooklyn.rest.transform.LocationTransformer.LocationDetailLevel;
import brooklyn.rest.util.EntityLocationUtils;
@@ -50,6 +51,7 @@ import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Sets;
+@HaHotStateRequired
public class LocationResource extends AbstractBrooklynRestResource implements LocationApi {
private static final Logger log = LoggerFactory.getLogger(LocationResource.class);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/35e6c3a5/usage/rest-server/src/main/java/brooklyn/rest/resources/PolicyConfigResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/PolicyConfigResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/PolicyConfigResource.java
index 842be53..f9493ea 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/PolicyConfigResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/PolicyConfigResource.java
@@ -31,6 +31,7 @@ import brooklyn.management.entitlement.Entitlements;
import brooklyn.policy.Policy;
import brooklyn.rest.api.PolicyConfigApi;
import brooklyn.rest.domain.PolicyConfigSummary;
+import brooklyn.rest.filter.HaHotStateRequired;
import brooklyn.rest.transform.PolicyTransformer;
import brooklyn.rest.util.BrooklynRestResourceUtils;
import brooklyn.rest.util.WebResourceUtils;
@@ -39,6 +40,7 @@ import brooklyn.util.flags.TypeCoercions;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+@HaHotStateRequired
public class PolicyConfigResource extends AbstractBrooklynRestResource implements PolicyConfigApi {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/35e6c3a5/usage/rest-server/src/main/java/brooklyn/rest/resources/PolicyResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/PolicyResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/PolicyResource.java
index 06e283d..c677bf5 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/PolicyResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/PolicyResource.java
@@ -35,6 +35,7 @@ import brooklyn.rest.api.PolicyApi;
import brooklyn.rest.domain.PolicySummary;
import brooklyn.rest.domain.Status;
import brooklyn.rest.domain.SummaryComparators;
+import brooklyn.rest.filter.HaHotStateRequired;
import brooklyn.rest.transform.ApplicationTransformer;
import brooklyn.rest.transform.PolicyTransformer;
import brooklyn.rest.util.WebResourceUtils;
@@ -44,6 +45,7 @@ import com.google.common.base.Function;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.Maps;
+@HaHotStateRequired
public class PolicyResource extends AbstractBrooklynRestResource implements PolicyApi {
private static final Logger log = LoggerFactory.getLogger(PolicyResource.class);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/35e6c3a5/usage/rest-server/src/main/java/brooklyn/rest/resources/SensorResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/SensorResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/SensorResource.java
index 8c6f3f3..708685d 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/SensorResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/SensorResource.java
@@ -36,6 +36,7 @@ import brooklyn.event.basic.BasicAttributeSensor;
import brooklyn.management.entitlement.Entitlements;
import brooklyn.rest.api.SensorApi;
import brooklyn.rest.domain.SensorSummary;
+import brooklyn.rest.filter.HaHotStateRequired;
import brooklyn.rest.transform.SensorTransformer;
import brooklyn.rest.util.WebResourceUtils;
import brooklyn.util.text.Strings;
@@ -44,6 +45,7 @@ import com.google.common.base.Function;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+@HaHotStateRequired
public class SensorResource extends AbstractBrooklynRestResource implements SensorApi {
private static final Logger log = LoggerFactory.getLogger(SensorResource.class);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/35e6c3a5/usage/rest-server/src/test/java/brooklyn/rest/BrooklynRestApiLauncher.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/BrooklynRestApiLauncher.java b/usage/rest-server/src/test/java/brooklyn/rest/BrooklynRestApiLauncher.java
index 7120d49..102f7dd 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/BrooklynRestApiLauncher.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/BrooklynRestApiLauncher.java
@@ -329,6 +329,8 @@ public class BrooklynRestApiLauncher {
// disable caching for dynamic content
config.getProperties().put(ResourceConfig.PROPERTY_CONTAINER_RESPONSE_FILTERS, NoCacheFilter.class.getName());
+ // Checks if appropriate request given HA status
+ config.getProperties().put(ResourceConfig.PROPERTY_RESOURCE_FILTER_FACTORIES, brooklyn.rest.filter.HaStateCheckResourceFilter.class.getName());
// configure to match empty path, or any thing which looks like a file path with /assets/ and extension html, css, js, or png
// and treat that as static content
config.getProperties().put(ServletContainer.PROPERTY_WEB_PAGE_CONTENT_REGEX, "(/?|[^?]*/assets/[^?]+\\.[A-Za-z0-9_]+)");