From dev-return-66934-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org Mon Jan 22 15:39:11 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 D1B3D180609 for ; Mon, 22 Jan 2018 15:39:11 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C0EF2160C4C; Mon, 22 Jan 2018 14:39:11 +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 140E0160C3A for ; Mon, 22 Jan 2018 15:39:10 +0100 (CET) Received: (qmail 50250 invoked by uid 500); 22 Jan 2018 14:39:09 -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 50078 invoked by uid 99); 22 Jan 2018 14:39:09 -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:09 +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 313CC1A0A1A for ; Mon, 22 Jan 2018 14:39:09 +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 xnawe3SGtQZa for ; Mon, 22 Jan 2018 14:39:07 +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 BCA445FE03 for ; Mon, 22 Jan 2018 14:39:06 +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 94F45E05FD for ; Mon, 22 Jan 2018 14:39:05 +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 3831C241F2 for ; Mon, 22 Jan 2018 14:39:04 +0000 (UTC) Date: Mon, 22 Jan 2018 14:39:04 +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= 16334337#comment-16334337 ]=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_r162954011 =20 --- Diff: src/java/test/org/apache/zookeeper/server/persistence/FileTxn= SnapLogTest.java --- @@ -159,4 +159,222 @@ public void onTxnLoaded(TxnHeader hdr, Record rec= ) { } } } + + @Test + public void testDirCheckWithCorrectFiles() throws IOException { + File tmpDir =3D ClientBase.createEmptyTestDir(); + File logDir =3D new File(tmpDir, "logdir"); + File snapDir =3D new File(tmpDir, "snapdir"); + File logVersionDir =3D new File(logDir, FileTxnSnapLog.version= + FileTxnSnapLog.VERSION); + File snapVersionDir =3D new File(snapDir, FileTxnSnapLog.versi= on + FileTxnSnapLog.VERSION); + + if (!logVersionDir.exists()) { + logVersionDir.mkdirs(); + } + if (!snapVersionDir.exists()) { + snapVersionDir.mkdirs(); + } + + Assert.assertTrue(logVersionDir.exists()); + Assert.assertTrue(snapVersionDir.exists()); + + // transaction log files in log dir - correct + File logFile1 =3D new File(logVersionDir.getPath() +File.separ= ator + Util.makeLogName(1L)); + logFile1.createNewFile(); + File logFile2 =3D new File(logVersionDir.getPath() +File.separ= ator + Util.makeLogName(2L)); + logFile2.createNewFile(); + + // snapshot files in snap dir - correct + File snapFile1 =3D new File(snapVersionDir.getPath() +File.sep= arator + Util.makeSnapshotName(1L)); + snapFile1.createNewFile(); + File snapFile2 =3D new File(snapVersionDir.getPath() +File.sep= arator + Util.makeSnapshotName(2L)); + snapFile2.createNewFile(); + + Assert.assertTrue(logFile1.exists()); + Assert.assertTrue(logFile2.exists()); + Assert.assertTrue(snapFile1.exists()); + Assert.assertTrue(snapFile2.exists()); + + String priorAutocreateDirValue =3D System.getProperty(FileTxnS= napLog.ZOOKEEPER_DATADIR_AUTOCREATE); + System.setProperty(FileTxnSnapLog.ZOOKEEPER_DATADIR_AUTOCREATE= , "false"); + FileTxnSnapLog fileTxnSnapLog; + try { + fileTxnSnapLog =3D new FileTxnSnapLog(logDir, snapDir); + } catch (FileTxnSnapLog.LogdirContentCheckException e) { + Assert.fail("Should not throw LogdirContentCheckException.= "); + } catch (FileTxnSnapLog.SnapdirContentCheckException e) { + Assert.fail("Should not throw SnapdirContentCheckException= ."); + } finally { + if (priorAutocreateDirValue =3D=3D null) { + System.clearProperty(FileTxnSnapLog.ZOOKEEPER_DATADIR_= AUTOCREATE); + } else { + System.setProperty(FileTxnSnapLog.ZOOKEEPER_DATADIR_AU= TOCREATE, priorAutocreateDirValue); + } + } + } + + @Test + public void testDirCheckWithSameLogAndSnapDirs() throws IOExceptio= n { --- End diff -- =20 I don't repeat my previous comments, all of them applies to the rest of= test cases. > 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)