From dev-return-66923-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org Mon Jan 22 15:39:08 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id BD7F6180609 for ; Mon, 22 Jan 2018 15:39:08 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id ACA85160C4D; Mon, 22 Jan 2018 14:39:08 +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 F250B160C3A for ; Mon, 22 Jan 2018 15:39:07 +0100 (CET) Received: (qmail 45890 invoked by uid 500); 22 Jan 2018 14:39:06 -0000 Mailing-List: contact dev-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zookeeper.apache.org Delivered-To: mailing list dev@zookeeper.apache.org Received: (qmail 45878 invoked by uid 99); 22 Jan 2018 14:39:06 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Jan 2018 14:39:06 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 5CCE61A0AC4 for ; Mon, 22 Jan 2018 14:39:06 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -99.911 X-Spam-Level: X-Spam-Status: No, score=-99.911 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01, USER_IN_WHITELIST=-100] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id l7a9cL7VaAkt for ; Mon, 22 Jan 2018 14:39:05 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id 098CA5FB0B for ; Mon, 22 Jan 2018 14:39:05 +0000 (UTC) Received: from jira-lw-us.apache.org (unknown [207.244.88.139]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 8C3ADE0F83 for ; Mon, 22 Jan 2018 14:39:04 +0000 (UTC) Received: from jira-lw-us.apache.org (localhost [127.0.0.1]) by jira-lw-us.apache.org (ASF Mail Server at jira-lw-us.apache.org) with ESMTP id EEAE5241C7 for ; Mon, 22 Jan 2018 14:39:03 +0000 (UTC) Date: Mon, 22 Jan 2018 14:39:03 +0000 (UTC) From: "ASF GitHub Bot (JIRA)" To: dev@zookeeper.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Commented] (ZOOKEEPER-2967) Add check to validate dataDir and dataLogDir parameters at startup MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/ZOOKEEPER-2967?page=3Dcom.atlas= sian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=3D= 16334328#comment-16334328 ]=20 ASF GitHub Bot commented on ZOOKEEPER-2967: ------------------------------------------- Github user anmolnar commented on a diff in the pull request: https://github.com/apache/zookeeper/pull/450#discussion_r162929390 =20 --- Diff: src/java/main/org/apache/zookeeper/server/persistence/FileTxn= SnapLog.java --- @@ -136,13 +136,51 @@ public FileTxnSnapLog(File dataDir, File snapDir)= throws IOException { throw new DatadirException("Cannot write to snap directory= " + this.snapDir); } =20 + // check content of transaction log and snapshot dirs if they = are two different directories + if(!this.dataDir.getPath().equals(this.snapDir.getPath())){ + checkLogDir(); + checkSnapDir(); + } + txnLog =3D new FileTxnLog(this.dataDir); snapLog =3D new FileSnap(this.snapDir); =20 autoCreateDB =3D Boolean.parseBoolean(System.getProperty(ZOOKE= EPER_DB_AUTOCREATE, ZOOKEEPER_DB_AUTOCREATE_DEFAULT)); } =20 + private void checkLogDir() throws LogdirContentCheckException { + File[] files =3D this.dataDir.listFiles(); + if(files !=3D null) { + boolean hasSnapshotFiles =3D false; + for (File file : files) { + if(Util.isSnapshotFile(file)){ + hasSnapshotFiles =3D true; + break; + } + } + if (hasSnapshotFiles) { + throw new LogdirContentCheckException("Log directory h= as snapshot files. Check if dataLogDir and dataDir configuration is correct= ."); + } + } + } + + private void checkSnapDir() throws SnapdirContentCheckException { + File[] files =3D this.snapDir.listFiles(); --- End diff -- =20 Same here. Get files with fileNameFilter and if it returns non-empty ar= ray, throw exception. > Add check to validate dataDir and dataLogDir parameters at startup > ------------------------------------------------------------------ > > Key: ZOOKEEPER-2967 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-2967 > Project: ZooKeeper > Issue Type: Improvement > Components: server > Affects Versions: 3.4.11 > Reporter: Andor Molnar > Assignee: Mark Fenes > Priority: Major > Labels: startup, validation > Fix For: 3.5.4, 3.6.0, 3.4.12 > > > According to=C2=A0 -ZOOKEEPER-2960-=C2=A0we should at a startup check to = validate that dataDir and dataLogDir parameters are set correctly. > Perhaps we should introduce a check of some kind? If datalogdir is differ= ent that datadir and snapshots exist in datalogdir we throw an exception an= d quit. -- This message was sent by Atlassian JIRA (v7.6.3#76005)