opendev/gerrit
Code Issues Proposed changes

H2CacheImpl: Ignore errors due to renamed classes

Browse Source 
Change-Id: Ifb75d79c4897d22723c889ec176f37e2f5d18fda
This commit is contained in:
Dave Borowitz 2016-06-28 09:17:29 -04:00 committed by David Pursehouse
parent dcf93b2b8a
commit 882acb39b3
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java vendored
View File

@ -14,11 +14,13 @@
package com.google.gerrit.server.cache.h2;
import com.google.common.base.Throwables;
import com.google.common.cache.AbstractLoadingCache;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.CacheStats;
import com.google.common.cache.LoadingCache;
import com.google.common.collect.ImmutableSet;
import com.google.common.hash.BloomFilter;
import com.google.common.hash.Funnel;
import com.google.common.hash.Funnels;
@ -81,6 +83,9 @@ public class H2CacheImpl<K, V> extends AbstractLoadingCache<K, V> implements
PersistentCache {
private static final Logger log = LoggerFactory.getLogger(H2CacheImpl.class);
private static final ImmutableSet<String> OLD_CLASS_NAMES = ImmutableSet.of(
"com.google.gerrit.server.change.ChangeKind");
private final Executor executor;
private final SqlStore<K, V> store;
private final TypeLiteral<K> keyType;
@ -472,7 +477,9 @@ public class H2CacheImpl<K, V> extends AbstractLoadingCache<K, V> implements
c.get.clearParameters();
}
} catch (SQLException e) {
log.warn("Cannot read cache " + url + " for " + key, e);
if (!isOldClassNameError(e)) {
log.warn("Cannot read cache " + url + " for " + key, e);
}
c = close(c);
return null;
} finally {
@ -480,6 +487,16 @@ public class H2CacheImpl<K, V> extends AbstractLoadingCache<K, V> implements
}
}
private static boolean isOldClassNameError(Throwable t) {
for (Throwable c : Throwables.getCausalChain(t)) {
if (c instanceof ClassNotFoundException
&& OLD_CLASS_NAMES.contains(c.getMessage())) {
return true;
}
}
return false;
}
private boolean expired(Timestamp created) {
if (expireAfterWrite == 0) {
return false;