From cc678035e6605681f2017394fcacca5ad87c2e98 Mon Sep 17 00:00:00 2001 From: Rob Fletcher Date: Mon, 1 Apr 2019 12:43:51 -0700 Subject: [PATCH] fix(health): remove potentially expensive Redis health indicator (#363) Arg --- .../spinnaker/fiat/config/RedisConfig.java | 36 ------------------- 1 file changed, 36 deletions(-) diff --git a/fiat-roles/src/main/java/com/netflix/spinnaker/fiat/config/RedisConfig.java b/fiat-roles/src/main/java/com/netflix/spinnaker/fiat/config/RedisConfig.java index 8957a73c3..acdfa403b 100644 --- a/fiat-roles/src/main/java/com/netflix/spinnaker/fiat/config/RedisConfig.java +++ b/fiat-roles/src/main/java/com/netflix/spinnaker/fiat/config/RedisConfig.java @@ -70,40 +70,4 @@ private static JedisPool createPool(GenericObjectPoolConfig redisPoolConfig, return new JedisPool(redisPoolConfig, host, port, timeout, password, database, null); } - - @Bean - public HealthIndicator redisHealth(final JedisPool jedisPool) { - return new HealthIndicator() { - @Override - public Health health() { - Health.Builder health; - try (Jedis jedis = jedisPool.getResource()) { - if ("PONG".equals(jedis.ping())) { - health = Health.up(); - } else { - health = Health.down(); - } - } catch (Exception ex) { - health = Health.down(ex); - } - - try { - Field f = FieldUtils.getField(JedisPool.class, "internalPool", true /*forceAccess*/); - Object o = FieldUtils.readField(f, jedisPool, true /*forceAccess*/); - if (o instanceof GenericObjectPool) { - GenericObjectPool internal = (GenericObjectPool) o; - health.withDetail("maxIdle", internal.getMaxIdle()); - health.withDetail("minIdle", internal.getMinIdle()); - health.withDetail("numActive", internal.getNumActive()); - health.withDetail("numIdle", internal.getNumIdle()); - health.withDetail("numWaiters", internal.getNumWaiters()); - } - } catch (IllegalAccessException iae) { - log.debug("Can't access jedis' internal pool", iae); - } - - return health.build(); - } - }; - } }