Author: ritchiem Date: 2008-09-04 11:15:09 -0400 (Thu, 04 Sep 2008) New Revision: 2407 Added: store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/BDBStoreUpgrade.log4j.xml Modified: store/branches/java/broker-queue-refactor/java/bdbstore/build.xml store/branches/java/broker-queue-refactor/java/bdbstore/etc/scripts/storeUpgrade.sh store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java Log: RHM-6 : Improved user feedback and added JE jar to classpath. Modified: store/branches/java/broker-queue-refactor/java/bdbstore/build.xml =================================================================== --- store/branches/java/broker-queue-refactor/java/bdbstore/build.xml 2008-09-04 15:14:49 UTC (rev 2406) +++ store/branches/java/broker-queue-refactor/java/bdbstore/build.xml 2008-09-04 15:15:09 UTC (rev 2407) @@ -61,19 +61,25 @@ <target name="build-main" depends="init"> <javac srcdir="${src.main.dir}" destdir="${build.classes}" - classpathref="test.class.path"/> + classpathref="test.class.path" debug="on"/> </target> <target name="build-tests" depends="init,build-main"> <javac srcdir="${src.test.dir}" destdir="${build.test.classes}" - classpathref="test.class.path"/> + classpathref="test.class.path" debug="on"/> </target> <target name="build-tools" depends="init,build-main"> <javac srcdir="${src.tools.dir}" destdir="${build.tools.classes}" - classpathref="tools.class.path"/> + classpathref="tools.class.path" debug="on"/> + <copy todir="${build.tools.classes}" > + <fileset dir="${src.tools.dir}"> + <exclude name="**/*.java"/> + <exclude name="**/package.html"/> + </fileset> + </copy> </target> <target name="jar" depends="build"> Modified: store/branches/java/broker-queue-refactor/java/bdbstore/etc/scripts/storeUpgrade.sh =================================================================== --- store/branches/java/broker-queue-refactor/java/bdbstore/etc/scripts/storeUpgrade.sh 2008-09-04 15:14:49 UTC (rev 2406) +++ store/branches/java/broker-queue-refactor/java/bdbstore/etc/scripts/storeUpgrade.sh 2008-09-04 15:15:09 UTC (rev 2407) @@ -18,4 +18,4 @@ export BDB_HOME=$(dirname $(dirname $(readlink -f $0))) fi -java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx256m -Damqj.logging.level=warn ${JAVA_OPTS} -cp $BDB_HOME/lib/qpid-bdbtools-M3.jar:$QPID_HOME/lib/qpid-bdbstore-M3.jar:$BDB_HOME/lib/qpid-incubating.jar org.apache.qpid.server.store.berkeleydb.BDBStoreUpgrade ${ARGS} +java -Xms256m -Dlog4j.configuration=BDBStoreUpgrade.log4j.xml -Xmx256m -Damqj.logging.level=warn ${JAVA_OPTS} -cp $BDB_HOME/lib/qpid-bdbtools-M3.jar:$QPID_HOME/lib/je-3.3.62.jar:$QPID_HOME/lib/qpid-bdbstore-M3.jar:$BDB_HOME/lib/qpid-incubating.jar org.apache.qpid.server.store.berkeleydb.BDBStoreUpgrade ${ARGS} Added: store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/BDBStoreUpgrade.log4j.xml =================================================================== --- store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/BDBStoreUpgrade.log4j.xml (rev 0) +++ store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/BDBStoreUpgrade.log4j.xml 2008-09-04 15:15:09 UTC (rev 2407) @@ -0,0 +1,52 @@ +<?xml version="1.0"?> +<!-- + - + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + - + --> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> + + <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender"> + + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d %-5p - %m%n"/> + </layout> + </appender> + + <category name="org.apache.qpid.server.store.berkeleydb.BDBStoreUpgrade"> + <priority value="info"/> + </category> + + <!-- Only show errors from the BDB Store --> + <category name="org.apache.qpid.server.store.berkeleydb.berkeleydb.BDBMessageStore"> + <priority value="error"/> + </category> + + <!-- Provide warnings to standard output --> + <category name="org.apache.qpid"> + <priority value="error"/> + </category> + + <!-- Log all info events to file --> + <root> + <priority value="info"/> + <appender-ref ref="STDOUT"/> + </root> + +</log4j:configuration> Modified: store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java =================================================================== --- store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java 2008-09-04 15:14:49 UTC (rev 2406) +++ store/branches/java/broker-queue-refactor/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java 2008-09-04 15:15:09 UTC (rev 2407) @@ -76,7 +76,7 @@ _fromDir = new File(fromDir); if (!_fromDir.exists()) { - throw new IllegalArgumentException("BDBStore path " + fromDir + " could not be read. " + throw new IllegalArgumentException("BDBStore path '" + fromDir + "' could not be read. " + "Ensure the path is correct and that the permissions are correct."); } @@ -85,13 +85,13 @@ { if (!_toDir.mkdirs()) { - throw new IllegalArgumentException("Environment path " + toDir + " could not be created. " + throw new IllegalArgumentException("Environment path '" + toDir + "' could not be created. " + "Ensure the path is correct and that the permissions are correct."); } } else { - throw new IllegalArgumentException("Environment path " + toDir + " already exists. "); + throw new IllegalArgumentException("Environment path '" + toDir + "' already exists. "); } @@ -154,12 +154,15 @@ private void upgradeFromVersion_1() throws AMQException, DatabaseException { + _logger.info("Migrating Message Metadata"); //Migrate _messageMetaDataDb; moveContents(_oldMessageStore.getMetaDataDb(), _newMessageStore.getMetaDataDb()); + _logger.info("Migrating Message Contents"); //Migrate _messageContentDb; moveContents(_oldMessageStore.getContentDb(), _newMessageStore.getContentDb()); + _logger.info("Migrating Queues"); //Migrate _queueDb; //Get the oldMessageStore Tuple Binding which does the parsing final TupleBinding queueTupleBinding = _oldMessageStore.getQueueTupleBindingFactory().getInstance(); @@ -179,12 +182,15 @@ } }); + _logger.info("Migrating Delivery Records"); //Migrate _deliveryDb; moveContents(_oldMessageStore.getDeliveryDb(), _newMessageStore.getDeliveryDb()); + _logger.info("Migrating Exchanges"); //Migrate _exchangeDb; moveContents(_oldMessageStore.getExchangesDb(), _newMessageStore.getExchangesDb()); + _logger.info("Migrating QueueBindings"); //Migrate _queueBindingsDb; final TupleBinding bindingTupleBinding = _oldMessageStore.getBindingTupleBindingFactory().getInstance(); _oldMessageStore.visitBindings(new BDBMessageStore.DatabaseVisitor() @@ -238,7 +244,7 @@ } } - public static void main(String[] args) throws Exception + public static void main(String[] args) { String fromDir, toDir; @@ -259,8 +265,19 @@ System.exit(1); } - new BDBStoreUpgrade(fromDir, toDir).upgradeFromVersion(1); + try + { + new BDBStoreUpgrade(fromDir, toDir).upgradeFromVersion(1); + _logger.info("Upgrade complete."); + } + catch (IllegalArgumentException iae) + { + _logger.error("Upgrade Not Started: " + iae.getMessage()); + } + catch (Exception e) + { + _logger.error("Upgrade failed: " + e.getMessage()); + } - System.out.println("Upgrade complete"); } }