Release Notes Update: Timer

doc/release-notes/5.0-release-notes.md

@@ -245,9 +245,10 @@ The instructions below describe the upgrade procedure based on moving an existin
    `sudo /usr/local/glassfish4/bin/asadmin stop-domain`
    `sudo cp -ar /usr/local/glassfish4/glassfish/domains/domain1 /usr/local/payara5/glassfish/domains/`
 
-7. Remove the Glassfish cache directories
+7. Remove the cache directories
 
-   `sudo rm -rf /usr/local/payara5/glassfish/domains/domain1/generated/`  `sudo rm -rf /usr/local/payara5/glassfish/domains/domain1/osgi-cache/`
+   `sudo rm -rf /usr/local/payara5/glassfish/domains/domain1/generated/`  
+   `sudo rm -rf /usr/local/payara5/glassfish/domains/domain1/osgi-cache/`
 
 8. In domain.xml:
 
@@ -263,18 +264,26 @@ Add the below JVM options beneath the -Ddataverse settings:
    <jvm-options>-XX:+UseStringDeduplication</jvm-options>
    <jvm-options>-XX:+DisableExplicitGC</jvm-options>
 
+Also in domain.xml, replace the follow element:
+
+  `<jdbc-connection-pool datasource-classname="org.apache.derby.jdbc.EmbeddedXADataSource" name="__TimerPool" res-type="javax.sql.XADataSource"> <property name="databaseName" value="${com.sun.aas.instanceRoot}/lib/databases/ejbtimer"></property><property name="connectionAttributes" value=";create=true"></property></jdbc-connection-pool>`
+
+with
+
+  `<jdbc-connection-pool datasource-classname="org.h2.jdbcx.JdbcDataSource" name="__TimerPool" res-type="javax.sql.XADataSource"> <property name="URL" value="jdbc:h2:${com.sun.aas.instanceRoot}/lib/databases/ejbtimer;AUTO_SERVER=TRUE"></property> </jdbc-connection-pool>`
+
 9. Change any full pathnames /usr/local/glassfish4/... to /usr/local/payara5/... or whatever it is in your case. (Specifically check the -Ddataverse.files.directory and -Ddataverse.files.file.directory JVM options)
 
-10.  In domain1/config/jhove.conf, change the hard-coded /usr/local/glassfish4 path, as above.
+10.   In domain1/config/jhove.conf, change the hard-coded /usr/local/glassfish4 path, as above.
 
 (Optional): If you renamed your service account from glassfish to payara or appserver, update the ownership permissions. The Installation Guide recommends a service account of `dataverse`:
 
    `sudo chown -R dataverse /usr/local/payara5/glassfish/domains/domain1`
    `sudo chown -R dataverse /usr/local/payara5/glassfish/lib`
 
-11. You will also need to check that the service account has write permission on the files directory, if they are located outside the old Glassfish domain. And/or make sure the service account has the correct AWS credentials, if you are using S3 for storage.
+11.  You will also need to check that the service account has write permission on the files directory, if they are located outside the old Glassfish domain. And/or make sure the service account has the correct AWS credentials, if you are using S3 for storage.
 
-12. Finally, start Payara:
+12.  Finally, start Payara:
 
    `sudo -u dataverse /usr/local/payara5/bin/asadmin start-domain`
 

doc/release-notes/5.3-release-notes.md

@@ -104,7 +104,7 @@ If this is a new installation, please see our [Installation Guide](https://guide
 
 ## Upgrade Instructions
 
-0\. These instructions assume that you've already successfully upgraded from Dataverse 4.x to  Dataverse 5 following the instructions in the [Dataverse 5 Release Notes](https://github.com/IQSS/dataverse/releases/tag/v5.0).
+0\. These instructions assume that you've already successfully upgraded from Dataverse 4.x to Dataverse 5 following the instructions in the [Dataverse 5 Release Notes](https://github.com/IQSS/dataverse/releases/tag/v5.0).
 
 1\. Upgrade to Payara 5.2020.6 or higher.
 
@@ -132,27 +132,31 @@ Please configure your connection details, replacing all the `${DB_...}`.
 - `<payara install path>/bin/asadmin create-password-alias --passwordfile /tmp/password.txt dataverse.db.password`
 - `rm /tmp/password.txt`
 
-4\. Reset the EJB timer database back to default:
+4\. In domain.xml, verify that the __TimerPool jdbc-connection-pool is using the H2 database, as follows (if you have the old Derby version from Glassfish 4, replace it):
+
+  `<jdbc-connection-pool datasource-classname="org.h2.jdbcx.JdbcDataSource" name="__TimerPool" res-type="javax.sql.XADataSource"> <property name="URL" value="jdbc:h2:${com.sun.aas.instanceRoot}/lib/databases/ejbtimer;AUTO_SERVER=TRUE"></property> </jdbc-connection-pool>`
+
+5\. Reset the EJB timer database back to default:
 
 - `<payara install path>/bin/asadmin set configs.config.server-config.ejb-container.ejb-timer-service.timer-datasource=jdbc/__TimerPool`
 
-5\. Delete the old password alias and DB pool:
+6\. Delete the old password alias and DB pool:
 
 - `<payara install path>/bin/asadmin delete-jdbc-connection-pool --cascade=true dvnDbPool`
 - `<payara install path>/bin/asadmin delete-password-alias db_password_alias`
 
-6\. Stop payara and remove the generated directory, start.
+7\. Stop payara, remove the generated and ejbtimer database directories, then restart.
 
 - `service payara stop`
-- remove the generated directory:
-`rm -rf <payara install path>/glassfish/domains/domain1/generated`
+- `rm -rf <payara install path>/glassfish/domains/domain1/generated`
+- `rm -rf <payara install path>/glassfish/domains/domain1/lib/databases/ejbtimer`
 - `service payara start`
 
-7\. Deploy this version.
+8\. Deploy this version.
 
 - `<payara install path>/bin/asadmin deploy dataverse-5.3.war`
 
-8\. Restart payara
+9\. Restart payara
 
 - `service payara stop`
 - `service payara start`