Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2C244C1F3 for ; Wed, 7 Jan 2015 17:35:27 +0000 (UTC) Received: (qmail 31852 invoked by uid 500); 7 Jan 2015 17:35:28 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 31841 invoked by uid 99); 7 Jan 2015 17:35:28 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jan 2015 17:35:28 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id B4F17AC0040; Wed, 7 Jan 2015 17:35:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1650123 - in /lucene/dev/trunk/solr: CHANGES.txt core/src/java/org/apache/solr/core/JmxMonitoredMap.java core/src/java/org/apache/solr/handler/ReplicationHandler.java Date: Wed, 07 Jan 2015 17:35:20 -0000 To: commits@lucene.apache.org From: thelabdude@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150107173526.B4F17AC0040@hades.apache.org> Author: thelabdude Date: Wed Jan 7 17:35:20 2015 New Revision: 1650123 URL: http://svn.apache.org/r1650123 Log: SOLR-6918: No need to log exceptions (as warn) generated when creating MBean stats if core is shutting down Modified: lucene/dev/trunk/solr/CHANGES.txt lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java Modified: lucene/dev/trunk/solr/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1650123&r1=1650122&r2=1650123&view=diff ============================================================================== --- lucene/dev/trunk/solr/CHANGES.txt (original) +++ lucene/dev/trunk/solr/CHANGES.txt Wed Jan 7 17:35:20 2015 @@ -650,6 +650,9 @@ Other Changes * SOLR-6830: Update Woodstox to 4.4.1 and StAX to 3.1.4. (ab) +* SOLR-6918: No need to log exceptions (as warn) generated when creating MBean stats if + the core is shutting down (Timothy Potter) + ================== 4.10.3 ================== Bug Fixes Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java?rev=1650123&r1=1650122&r2=1650123&view=diff ============================================================================== --- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java (original) +++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java Wed Jan 7 17:35:20 2015 @@ -16,6 +16,7 @@ */ package org.apache.solr.core; +import org.apache.lucene.store.AlreadyClosedException; import org.apache.solr.common.SolrException; import org.apache.solr.common.util.NamedList; import org.apache.solr.core.SolrConfig.JmxConfiguration; @@ -279,7 +280,9 @@ public class JmxMonitoredMap exten } } } catch (Exception e) { - LOG.warn("Could not getStatistics on info bean {}", infoBean.getName(), e); + // don't log issue if the core is closing + if (!(SolrException.getRootCause(e) instanceof AlreadyClosedException)) + LOG.warn("Could not getStatistics on info bean {}", infoBean.getName(), e); } MBeanAttributeInfo[] attrInfoArr = attrInfoList Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java?rev=1650123&r1=1650122&r2=1650123&view=diff ============================================================================== --- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java (original) +++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java Wed Jan 7 17:35:20 2015 @@ -572,7 +572,7 @@ public class ReplicationHandler extends NamedList list = super.getStatistics(); if (core != null) { list.add("indexSize", NumberUtils.readableSize(getIndexSize())); - CommitVersionInfo vInfo = getIndexVersion(); + CommitVersionInfo vInfo = (core != null && !core.isClosed()) ? getIndexVersion(): null; list.add("indexVersion", null == vInfo ? 0 : vInfo.version); list.add(GENERATION, null == vInfo ? 0 : vInfo.generation);