kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix start error issue

This commit is contained in:
zhangxin 2017-04-13 09:49:01 +08:00
parent ccba3d5b3d
commit 45bfd06b9b
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/EsConfig.java
View File

@ -32,6 +32,8 @@ public class EsConfig {
}
public enum IndexInitMode {
auto, forced, manual
AUTO,
FORCED,
MANUAL
}
}

4
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/IndexCreator.java
View File

@ -17,12 +17,12 @@ public enum IndexCreator {
private Logger logger = LogManager.getFormatterLogger(IndexCreator.class);
public void create() {
if (!EsConfig.IndexInitMode.manual.equals(EsConfig.Es.Index.Initialize.mode)) {
if (!EsConfig.IndexInitMode.MANUAL.equals(EsConfig.Es.Index.Initialize.mode)) {
Set<AbstractIndex> indexSet = loadIndex();
for (AbstractIndex index : indexSet) {
boolean isExists = index.isExists();
if (isExists) {
if (EsConfig.IndexInitMode.forced.equals(EsConfig.Es.Index.Initialize.mode)) {
if (EsConfig.IndexInitMode.FORCED.equals(EsConfig.Es.Index.Initialize.mode)) {
index.deleteIndex();
index.createIndex();
}

10
skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/IndexCreatorTestCase.java
View File

@ -65,7 +65,7 @@ public class IndexCreatorTestCase {
@Test
public void testCreateOptionManual() throws Exception {
EsConfig.Es.Index.Initialize.mode = EsConfig.IndexInitMode.manual;
EsConfig.Es.Index.Initialize.mode = EsConfig.IndexInitMode.MANUAL;
indexCreator.create();
Mockito.verify(testIndex, Mockito.never()).createIndex();
Mockito.verify(testIndex, Mockito.never()).deleteIndex();
@ -73,7 +73,7 @@ public class IndexCreatorTestCase {
@Test
public void testCreateOptionForcedIndexIsExists() throws Exception {
EsConfig.Es.Index.Initialize.mode = EsConfig.IndexInitMode.forced;
EsConfig.Es.Index.Initialize.mode = EsConfig.IndexInitMode.FORCED;
when(testIndex.isExists()).thenReturn(true);
indexCreator.create();
Mockito.verify(testIndex).createIndex();
@ -82,7 +82,7 @@ public class IndexCreatorTestCase {
@Test
public void testCreateOptionForcedIndexNotExists() throws Exception {
EsConfig.Es.Index.Initialize.mode = EsConfig.IndexInitMode.forced;
EsConfig.Es.Index.Initialize.mode = EsConfig.IndexInitMode.FORCED;
when(testIndex.isExists()).thenReturn(false);
indexCreator.create();
Mockito.verify(testIndex).createIndex();
@ -91,7 +91,7 @@ public class IndexCreatorTestCase {
@Test
public void testCreateOptionAutoIndexNotExists() throws Exception {
EsConfig.Es.Index.Initialize.mode = EsConfig.IndexInitMode.auto;
EsConfig.Es.Index.Initialize.mode = EsConfig.IndexInitMode.AUTO;
when(testIndex.isExists()).thenReturn(false);
indexCreator.create();
Mockito.verify(testIndex).createIndex();
@ -100,7 +100,7 @@ public class IndexCreatorTestCase {
@Test
public void testCreateOptionAutoIndexExists() throws Exception {
EsConfig.Es.Index.Initialize.mode = EsConfig.IndexInitMode.auto;
EsConfig.Es.Index.Initialize.mode = EsConfig.IndexInitMode.AUTO;
when(testIndex.isExists()).thenReturn(true);
indexCreator.create();
Mockito.verify(testIndex, Mockito.never()).createIndex();