Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 958AB200B2A for ; Fri, 10 Jun 2016 22:22:50 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 941ED160A38; Fri, 10 Jun 2016 20:22:50 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id DB4B2160A5A for ; Fri, 10 Jun 2016 22:22:49 +0200 (CEST) Received: (qmail 98441 invoked by uid 500); 10 Jun 2016 20:22:48 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 98272 invoked by uid 99); 10 Jun 2016 20:22:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Jun 2016 20:22:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6A364DFFAB; Fri, 10 Jun 2016 20:22:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stefania@apache.org To: commits@cassandra.apache.org Date: Fri, 10 Jun 2016 20:22:49 -0000 Message-Id: <2f475d92e7214f98a16ceee9a5b53634@git.apache.org> In-Reply-To: <86ab00d56ee1483ab77b5a201d1fcf67@git.apache.org> References: <86ab00d56ee1483ab77b5a201d1fcf67@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/6] cassandra git commit: StorageService shutdown hook should use a volatile variable archived-at: Fri, 10 Jun 2016 20:22:50 -0000 StorageService shutdown hook should use a volatile variable patch by Ed Capriolo; reviewed by Stefania Alborghetti for CASSANDRA-11984 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1dffa022 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1dffa022 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1dffa022 Branch: refs/heads/cassandra-3.0 Commit: 1dffa02250c493862f773af9b691a3bf3db6f76d Parents: 360541f Author: Edward Capriolo Authored: Fri Jun 10 10:45:57 2016 -0500 Committer: Stefania Alborghetti Committed: Fri Jun 10 15:16:38 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1dffa022/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index ce48994..7ec3ae9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.2.7 + * StorageService shutdown hook should use a volatile variable (CASSANDRA-11984) * Persist local metadata earlier in startup sequence (CASSANDRA-11742) * Run CommitLog tests with different compression settings (CASSANDRA-9039) * cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664) http://git-wip-us.apache.org/repos/asf/cassandra/blob/1dffa022/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index 83639e0..6b64664 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -212,7 +212,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE public volatile VersionedValue.VersionedValueFactory valueFactory = new VersionedValue.VersionedValueFactory(getPartitioner()); private Thread drainOnShutdown = null; - private boolean inShutdownHook = false; + private volatile boolean inShutdownHook = false; public static final StorageService instance = new StorageService();