-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
84 changed files
with
186 additions
and
1,231 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -103,7 +103,7 @@ services: | |
| << : *worker-xrootd | ||
| command: > | ||
| entrypoint worker-xrootd | ||
| --db-uri mysql://[email protected]:3306 | ||
| --db-uri mysql://qsmaster:CHANGEME2@127.0.0.1:3306 | ||
| --db-admin-uri mysql://root:[email protected]:3306 | ||
| --vnid-config "@/usr/local/lib64/libreplica.so {{db_uri}}/qservw_worker 0 0" | ||
| --repl-instance-id qserv_proj | ||
|
|
@@ -138,8 +138,8 @@ services: | |
| << : *worker-cmsd | ||
| command: > | ||
| entrypoint worker-cmsd | ||
| --db-uri mysql://qsmaster@worker_mariadb_0:3306 | ||
| --vnid-config "@/usr/local/lib64/libreplica.so mysql://[email protected]:3306/qservw_worker 0 0" | ||
| --db-uri mysql://qsmaster:CHANGEME2@worker_mariadb_0:3306 | ||
| --vnid-config "@/usr/local/lib64/libreplica.so mysql://qsmaster:CHANGEME2@127.0.0.1:3306/qservw_worker 0 0" | ||
| --results-dirname /qserv/data/results | ||
| --repl-instance-id qserv_proj | ||
| --repl-auth-key replauthkey | ||
|
|
@@ -208,9 +208,9 @@ services: | |
| << : *worker-xrootd | ||
| command: > | ||
| entrypoint --log-level DEBUG worker-xrootd | ||
| --db-uri mysql://[email protected]:3306?socket={{db_socket}} | ||
| --db-uri mysql://qsmaster:CHANGEME2@127.0.0.1:3306?socket={{db_socket}} | ||
| --db-admin-uri mysql://root:[email protected]:3306?socket={{db_socket}} | ||
| --vnid-config "@/usr/local/lib64/libreplica.so mysql://[email protected]:3306/qservw_worker 0 0" | ||
| --vnid-config "@/usr/local/lib64/libreplica.so mysql://qsmaster:CHANGEME2@127.0.0.1:3306/qservw_worker 0 0" | ||
| --repl-instance-id qserv_proj | ||
| --repl-auth-key replauthkey | ||
| --repl-admin-auth-key=repladminauthkey | ||
|
|
@@ -244,8 +244,8 @@ services: | |
| << : *worker-cmsd | ||
| command: > | ||
| entrypoint --log-level DEBUG worker-cmsd | ||
| --db-uri mysql://qsmaster@worker_mariadb_1:3306?socket=/qserv/mariadb/run/mysqld.sock | ||
| --vnid-config "@/usr/local/lib64/libreplica.so mysql://[email protected]:3306/qservw_worker 0 0" | ||
| --db-uri mysql://qsmaster:CHANGEME2@worker_mariadb_1:3306?socket=/qserv/mariadb/run/mysqld.sock | ||
| --vnid-config "@/usr/local/lib64/libreplica.so mysql://qsmaster:CHANGEME2@127.0.0.1:3306/qservw_worker 0 0" | ||
| --results-dirname /qserv/data/results | ||
| --repl-instance-id qserv_proj | ||
| --repl-auth-key replauthkey | ||
|
|
@@ -357,7 +357,7 @@ services: | |
| init: true | ||
| command: > | ||
| entrypoint --log-level DEBUG proxy | ||
| --db-uri mysql://[email protected]:3306?socket={{db_socket}} | ||
| --db-uri mysql://qsmaster:CHANGEME2@127.0.0.1:3306?socket={{db_socket}} | ||
| --db-admin-uri mysql://root:[email protected]:3306?socket={{db_socket}} | ||
| --targs db_socket=/qserv/mariadb/run/mysqld.sock | ||
| --xrootd-manager czar_xrootd | ||
|
|
@@ -395,7 +395,7 @@ services: | |
| init: true | ||
| command: > | ||
| entrypoint --log-level DEBUG czar-http | ||
| --db-uri mysql://qsmaster@czar_mariadb:3306/ | ||
| --db-uri mysql://qsmaster:CHANGEME2@czar_mariadb:3306/ | ||
| --xrootd-manager czar_xrootd | ||
| --czar-name http | ||
| --http-port 4048 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| .. _admin-upgrade: | ||
|
|
||
| Instructins for upgrading Qserv to newer releases | ||
| ================================================= | ||
|
|
||
| .. _admin-upgrade-mariadb-11-4-4: | ||
|
|
||
| Upgrading Qserv to MariaDB 11.4.4 | ||
| --------------------------------- | ||
|
|
||
| MariaDB 11.4.4 is a major release that introduces a number of new features and | ||
| improvements. If your instance of Qserv is still based on MariaDB 10.6.8, you | ||
| need to upgrade your data to the new version. | ||
|
|
||
| To upgrade your Qserv installation to MariaDB 11.4.4, follow these steps: | ||
|
|
||
| - Read the `MariaDB 11.4.4 release notes <https://mariadb.com/kb/en/mariadb-11-4-4-release-notes>`_ to learn about the new features and improvements. | ||
| - Read the guide `Upgrading from MariaDB 10.6 to MariaDB 10.11 <https://mariadb.com/kb/en/upgrading-from-mariadb-10-6-to-mariadb-10-11>`_ to learn how to upgrade your databases. | ||
| - Turn Qserv into the database-only mode by ensuring that all but the MariaDB services are being run. | ||
| - Log into the MariaDB containers and run the database upgrade command as shown below: | ||
|
|
||
| .. code-block:: bash | ||
| mariadb-upgrade -P3306 -h127.0.0.1 --protocol=tcp -uroot -p****** | ||
| Where ``-P`` specifies the port number, ``-h`` specifies the host, ``-u`` specifies the user, and ``-p`` specifies the password. | ||
| Note that the port number may be different in your installation. | ||
|
|
||
| Experiments with the production databases at USDF (SLAC) have shown that the upgrade process is safe and reliable. | ||
| However, it is still recommended to make a backup of your data before proceeding with the upgrade. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,6 @@ | ||
| -- MySQL dump 10.13 Distrib 5.1.61, for redhat-linux-gnu (x86_64) | ||
| -- | ||
| -- Host: localhost Database: case01_m | ||
| -- ------------------------------------------------------ | ||
| -- Server version 5.1.61-log | ||
|
|
||
| /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; | ||
| /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; | ||
| /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; | ||
| /*!40101 SET NAMES utf8 */; | ||
| /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; | ||
| /*!40103 SET TIME_ZONE='+00:00' */; | ||
| /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; | ||
| /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; | ||
|
|
||
| -- | ||
| -- Table structure for table `Filter` | ||
| -- | ||
|
|
||
| DROP TABLE IF EXISTS `Filter`; | ||
| /*!40101 SET @saved_cs_client = @@character_set_client */; | ||
| /*!40101 SET character_set_client = utf8 */; | ||
| CREATE TABLE `Filter` ( | ||
| `filterId` tinyint(4) NOT NULL, | ||
| `filterName` char(3) NOT NULL, | ||
| `photClam` float NOT NULL, | ||
| `photBW` float NOT NULL | ||
| ) ENGINE=MyISAM DEFAULT CHARSET=latin1; | ||
| /*!40101 SET character_set_client = @saved_cs_client */; | ||
|
|
||
| /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; | ||
|
|
||
| /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; | ||
| /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; | ||
| /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; | ||
| /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; | ||
| /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; | ||
|
|
||
| -- Dump completed on 2012-03-28 10:31:56 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.