-
Notifications
You must be signed in to change notification settings - Fork 3.8k
CacheMonitor - make cache injection optional #1973
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
Merged
drcrallen
merged 1 commit into
apache:master
from
metamx:cachemonitor-optional-injection
Nov 17, 2015
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
75 changes: 75 additions & 0 deletions
75
server/src/test/java/io/druid/client/cache/CacheMonitorTest.java
This file contains hidden or 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,75 @@ | ||
| /* | ||
| * Licensed to Metamarkets Group Inc. (Metamarkets) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. Metamarkets 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 io.druid.client.cache; | ||
|
|
||
| import com.google.common.collect.ImmutableList; | ||
| import com.google.inject.Binder; | ||
| import com.google.inject.Injector; | ||
| import com.google.inject.Key; | ||
| import com.google.inject.Module; | ||
| import io.druid.guice.GuiceInjectors; | ||
| import io.druid.guice.JsonConfigProvider; | ||
| import io.druid.guice.annotations.Self; | ||
| import io.druid.initialization.Initialization; | ||
| import io.druid.server.DruidNode; | ||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
|
|
||
| public class CacheMonitorTest | ||
| { | ||
| @Test | ||
| public void testOptionalInject() throws Exception | ||
| { | ||
| Injector injector = Initialization.makeInjectorWithModules(GuiceInjectors.makeStartupInjector(), ImmutableList.of( | ||
| new Module() { | ||
| @Override | ||
| public void configure(Binder binder) | ||
| { | ||
| JsonConfigProvider.bindInstance( | ||
| binder, Key.get(DruidNode.class, Self.class), new DruidNode("test-inject", null, null) | ||
| ); | ||
| } | ||
| } | ||
| )); | ||
|
|
||
| CacheMonitor monitor = injector.getInstance(CacheMonitor.class); | ||
| Assert.assertNull(monitor.cache); | ||
| } | ||
|
|
||
| @Test | ||
| public void testInject() throws Exception | ||
| { | ||
| Injector injector = Initialization.makeInjectorWithModules(GuiceInjectors.makeStartupInjector(), ImmutableList.of( | ||
| new Module() { | ||
| @Override | ||
| public void configure(Binder binder) | ||
| { | ||
| JsonConfigProvider.bindInstance( | ||
| binder, Key.get(DruidNode.class, Self.class), new DruidNode("test-inject", null, null) | ||
| ); | ||
| binder.bind(Cache.class).toInstance(MapCache.create(0)); | ||
| } | ||
| } | ||
| )); | ||
|
|
||
| CacheMonitor monitor = injector.getInstance(CacheMonitor.class); | ||
| Assert.assertNotNull(monitor.cache); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this constructor still needed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if someone uses it directly, yes
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not a big deal but,
i meant, is anything actually using this constructor anymore. If not, then we can remove it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not within Druid at least. Fine to remove, unless we want to preserve binary compatibility for extensions that might bind it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if they are binding via guice then this shouldn't break anything.
I would remove it.
It is up to you though, I'm fine either ways :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🤖 agent-workflow — Working on it
This is a valid concern. The cached
review_decisionfield is only refreshed during the auto-detect block whenWORKFLOW_RESULTis empty, but after COMPLETE is set, the cached value can become stale. A fix is in progress to refresh the review decision before the BLOCKED check in the staleness guard.Automated reply — not a human reviewer.