Skip to content

handle empty data directory in index check #3981

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.

Sign up for GitHub

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
merged 3 commits into from
Jul 6, 2022
Merged

handle empty data directory in index check #3981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74a86bf
handle empty data directory
vladak Jul 5, 2022
d92b987
bump year
vladak Jul 5, 2022
b8d9938
improve error message
vladak Jul 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

/*
* Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
* Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
*/
package org.opengrok.indexer.index;
Expand All @@ -28,6 +28,8 @@
import java.util.Collection;
import java.util.logging.Level;
import java.util.logging.Logger;

import org.apache.lucene.index.IndexNotFoundException;
import org.apache.lucene.index.SegmentInfos;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
Expand Down Expand Up @@ -135,8 +137,13 @@ public static void checkDir(File dir) throws IndexVersionException, IOException
int segVersion;

try (Directory indexDirectory = FSDirectory.open(dir.toPath(), lockFactory)) {
SegmentInfos segInfos = SegmentInfos.readLatestCommit(indexDirectory);
segVersion = segInfos.getIndexCreatedVersionMajor();
try {
SegmentInfos segInfos = SegmentInfos.readLatestCommit(indexDirectory);
segVersion = segInfos.getIndexCreatedVersionMajor();
} catch (IndexNotFoundException e) {
LOGGER.log(Level.FINE, "no index found in ''{0}''", indexDirectory);
return;
}
}

if (segVersion != Version.LATEST.major) {
Expand Down
10 changes: 9 additions & 1 deletion opengrok-indexer/src/test/java/org/opengrok/indexer/index/IndexCheckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

/*
* Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
* Portions Copyright (c) 2019, Chris Fraire <[email protected]>.
*/
package org.opengrok.indexer.index;
Expand All @@ -33,6 +33,7 @@
import java.util.Arrays;
import java.util.List;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
Expand All @@ -42,6 +43,7 @@
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.opengrok.indexer.configuration.Configuration;
import org.opengrok.indexer.configuration.RuntimeEnvironment;
import org.opengrok.indexer.history.RepositoryFactory;
Expand Down Expand Up @@ -140,4 +142,10 @@ void testIndexVersionOldIndex() throws Exception {

assertThrows(IndexCheck.IndexVersionException.class, () -> IndexCheck.checkDir(indexDir));
}

@Test
void testEmptyDir(@TempDir Path tempDir) throws Exception {
assertEquals(0, tempDir.toFile().list().length);
IndexCheck.checkDir(tempDir.toFile());
}
}