Permalink
Browse files

Rename 'bucardo_ctl' to just 'bucardo'. Yowza!

  • Loading branch information...
turnstep committed Jun 6, 2011
1 parent a3fe28f commit 4c06822bd87412cae2c921484bbd347481a25bf0
Showing with 469 additions and 940 deletions.
  1. +1 −1 .perlcriticrc
  2. +6 −6 Bucardo.pm
  3. +1 −1 Bucardo.pm.html
  4. +17 −15 Changes
  5. +1 −1 INSTALL
  6. +3 −3 MANIFEST
  7. +2 −2 META.yml
  8. +6 −6 Makefile.PL
  9. +10 −10 README.dev
  10. +7 −7 UPGRADE
  11. +68 −66 bucardo_ctl → bucardo
  12. +0 −486 bucardo_ctl.html
  13. +1 −1 scripts/README
  14. +19 −19 scripts/{bucardo_ctl.rc → bucardo.rc}
  15. +7 −7 scripts/slony_migrator.pl
  16. +2 −2 t/00-release.t
  17. +1 −1 t/01-basic.t
  18. +53 −53 t/02-bctl-db.t
  19. +28 −28 t/02-bctl-dbg.t
  20. +53 −53 t/02-bctl-goat.t
  21. +56 −56 t/02-bctl-herd.t
  22. +53 −53 t/02-bctl-sync.t
  23. +14 −14 t/20-mongo.t
  24. +14 −14 t/20-mysql.t
  25. +1 −1 t/99-perlcritic.t
  26. +6 −6 t/99-spellcheck.t
  27. +39 −28 t/BucardoTesting.pm
View
@@ -69,7 +69,7 @@ profile-strictness = quiet
[-Editor::RequireEmacsFileVariables]
[-Lax::ProhibitEmptyQuotes::ExceptAsFallback]
## This one really ought to be removed entirely:
-## Giving too many false positives in bucardo_ctl:
+## Giving too many false positives in bucardo:
[-Miscellanea::ProhibitUselessNoCritic]
[-Miscellanea::RequireRcsKeywords]
[-References::ProhibitDoubleSigils]
View
@@ -3,7 +3,7 @@
## The main Bucardo program
##
-## This script should only be called via the 'bucardo_ctl' program
+## This script should only be called via the 'bucardo' program
##
## Copyright 2006-2011 Greg Sabino Mullane <greg@endpoint.com>
##
@@ -297,7 +297,7 @@ sub new {
warn qq{Cannot start: configured to only run on "$osafe". This is "$hostname"\n};
warn qq{ This is usually done to prevent a configured Bucardo from running\n};
warn qq{ on the wrong host. Please verify the 'db' settings by doing:\n};
- warn qq{bucardo_ctl list dbs\n};
+ warn qq{bucardo list dbs\n};
warn qq{ Once you are sure the bucardo.db table has the correct values,\n};
warn qq{ you can adjust the 'host_safety_check' value\n};
exit 2;
@@ -311,7 +311,7 @@ sub new {
sub start_mcp {
- ## Start the Bucardo daemon. Called by bucardo_ctl after setsid()
+ ## Start the Bucardo daemon. Called by bucardo after setsid()
## Arguments: one
## 1. Hashref of startup arguments
## Returns: never (exit 0 or exit 1)
@@ -462,7 +462,7 @@ sub start_mcp {
$self->glog("PID: $$", LOG_WARN);
$self->glog("Postgres backend PID: $self->{mcp_backend}", LOG_WARN);
$self->glog('Postgres library version: ' . $masterdbh->{pg_lib_version}, LOG_WARN);
- $self->glog("bucardo_ctl: $old0", LOG_WARN);
+ $self->glog("bucardo: $old0", LOG_WARN);
$self->glog('Bucardo.pm: ' . $INC{'Bucardo.pm'}, LOG_WARN);
$self->glog((sprintf 'OS: %s Perl: %s %vd', $^O, $^X, $^V), LOG_WARN);
## Get a integer version of the DBD::Pg version, for later comparisons
@@ -602,7 +602,7 @@ sub start_mcp {
$self->glog("Sleep time: $config{mcp_dbproblem_sleep}", LOG_TERSE);
sleep($config{mcp_dbproblem_sleep});
- ## We assume this is bucardo_ctl, and that we are in same directory as when called
+ ## We assume this is bucardo, and that we are in same directory as when called
my $RUNME = $old0;
## Check to see if $RUNME is executable as is, before we assume we're in the same directory
if (! -x $RUNME) {
@@ -7396,7 +7396,7 @@ of Perl, a custom database schema, Pl/Perlu, and Pl/Pgsql.
Bucardo is unapologetically extremely verbose in its logging.
Full documentation can be found on the website, or in the files that came with
-this distribution. See also the documentation for the bucardo_ctl program.
+this distribution. See also the documentation for the bucardo program.
=head1 DEPENDENCIES
View
@@ -55,7 +55,7 @@ <h1><a name="description">DESCRIPTION</a></h1>
of Perl, a custom database schema, Pl/Perlu, and Pl/Pgsql.</p>
<p>Bucardo is unapologetically extremely verbose in its logging.</p>
<p>Full documentation can be found on the website, or in the files that came with
-this distribution. See also the documentation for the bucardo_ctl program.</p>
+this distribution. See also the documentation for the bucardo program.</p>
<p>
</p>
<hr />
View
32 Changes
@@ -2,6 +2,8 @@
Bucardo version 5.0.0, released ??, 2011
+ - Rename bucardo_ctl to simply bucardo [Jon Jensen, GSM]
+
- Change the way that swap syncs work: should be much faster [GSM]
- Use asynchronous queries when possible [GSM]
@@ -32,7 +34,7 @@ Bucardo version 5.0.0, released ??, 2011
- Fix bug in bucardo_purge_q_table in index detection logic. [Aolmezov]
- - Show the reason why a sync failed on a failed bucardo_ctl kick. [GSM]
+ - Show the reason why a sync failed on a failed bucardo kick. [GSM]
- Fix errors with bytea and swap syncs. [GSM]
@@ -44,11 +46,11 @@ Bucardo version 5.0.0, released ??, 2011
- Add a log_level parameter, and classify all messages inside Bucardo.pm
with a log_level of TERSE, NORMAL, VERBOSE, or DEBUG. [Rosser Schwarz and GSM]
- - Relax SELECT version() regex in bucardo_ctl, to let modified versions
+ - Relax SELECT version() regex in bucardo, to let modified versions
of Postgres tell us their version. [GSM]
- - Fix incorrect automatic population of database when using bucardo_ctl
- add database and only one database exists. [GSM]
+ - Fix incorrect automatic population of database when using
+ 'bucardo add database' and only one database exists. [GSM]
- Fix failing makedelta when using multi-column primary keys.
[GSM, reported by Michelle Sullivan]
@@ -61,37 +63,37 @@ Bucardo version 5.0.0, released ??, 2011
and kidsalive. [GSM, idea from Andrew Spencer]
- Refuse to start if the bucardo database version does not match that of
- bucardo_ctl (the former is set by 'bucardo_ctl upgrade') [GSM]
+ bucardo (the former is set by 'bucardo upgrade') [GSM]
- Set the search_path to prevent bogus warnings on startup about sequence
mismatches based on schema names. [GSM] (Bug #17)
- - Add a --force option so we can remove databases via 'bucardo_ctl remove db'
+ - Add a --force option so we can remove databases via 'bucardo remove db'
along with all related goats and syncs. [GSM]
- Remove race condition from bucardo_purge_q_table() [GSM]
- - Add new options for 'bucardo_ctl add db': addalltables and addallsequences [GSM]
+ - Add new options for 'bucardo add db': addalltables and addallsequences [GSM]
- - Allow 'bucardo_ctl status' to run even if piddir is not available. [GSM]
+ - Allow 'bucardo status' to run even if piddir is not available. [GSM]
- Don't bother comparing the 'log_cnt' field of sequences. [Rosser Schwarz]
- - Allow "schema.table" format for bucardo_ctl list tables [GSM]
+ - Allow "schema.table" format for 'bucardo list tables' [GSM]
- Add new option "log_microsecond" to show sub-second output in logs. [GSM]
- Make sure we update bucardo_config.bucardo_current_version when doing
- a bucardo_ctl upgrade [GSM] (Bug #5)
+ a 'bucardo upgrade' [GSM] (Bug #5)
- Automatically create the bucardo (superuser) if we can connect as 'postgres'. [GSM]
- - Allow removal of tables from herds via bucardo_ctl. [GSM]
+ - Allow removal of tables from herds via bucardo. [GSM]
- Add create_child_q_table() function. [GSM]
- - Allow 'bucardo_ctl update herd foo remove <table(s)>'
- and 'bucardo_ctl update herd foo add <table(s)>' [GSM]
+ - Allow 'bucardo update herd foo remove <table(s)>'
+ and 'bucardo update herd foo add <table(s)>' [GSM]
- Better formatting of bucardo.reason.log, and log startup failures. [GSM]
@@ -101,9 +103,9 @@ Bucardo version 5.0.0, released ??, 2011
- Remove unused 'kick_sleep' config variable. [GSM]
- - Show the database name when listing herds via bucardo_ctl. [GSM]
+ - Show the database name when listing herds via bucardo. [GSM]
- - Show the database name when listing sequences via bucardo_ctl. [Douglas Tan]
+ - Show the database name when listing sequences via bucardo. [Douglas Tan]
- Show each target's Postgres version, time, and timezone on first connect. [GSM]
View
@@ -32,7 +32,7 @@ recommended before installing.
Once the above has been run, you will need to create a Bucardo database.
This can be done by running:
-bucardo_ctl install
+bucardo install
There should be no errors: if there are, please report them to
bucardo-general@bucardo.org or ask on IRC for help.
View
@@ -1,6 +1,6 @@
Bucardo.pm
bucardo.schema
-bucardo_ctl
+bucardo
SIGNATURE
README
@@ -20,11 +20,11 @@ scripts/README
scripts/bucardo_rrd
scripts/bucardo-report
scripts/check_bucardo_sync
-scripts/bucardo_ctl.rc
+scripts/bucardo.rc
scripts/slony_migrator.pl
Bucardo.pm.html
-bucardo_ctl.html
+bucardo.html
## Testing-related stuff
.perlcriticrc
View
@@ -26,8 +26,8 @@ provides:
Bucardo:
file : Bucardo.pm
version : 4.5.0
- bucardo_ctl:
- file : bucardo_ctl
+ bucardo:
+ file : bucardo
version : 4.5.0
resources:
View
@@ -27,8 +27,8 @@ WriteMakefile(
NO_META => 1,
NEEDS_LINKING => 0,
VERSION_FROM => 'Bucardo.pm',
- EXE_FILES => ['bucardo_ctl'],
- MAN1PODS => { 'bucardo_ctl' => 'blib/man1/bucardo_ctl.1pm' },
+ EXE_FILES => ['bucardo'],
+ MAN1PODS => { 'bucardo' => 'blib/man1/bucardo.1pm' },
NORECURS => 1,
);
@@ -39,11 +39,11 @@ sub clean {
$string =~ s{\t}{\tperl t/98-cleanup\.t\n\t};
$string .= qq{\n\nhtml : \n\t};
$string .= qq{\t\$(NOECHO) pod2html Bucardo.pm > Bucardo.pm.html\n};
- $string .= qq{\t\$(NOECHO) pod2html bucardo_ctl > bucardo_ctl.html\n};
+ $string .= qq{\t\$(NOECHO) pod2html bucardo > bucardo.html\n};
$string .= qq{\t\$(NOECHO) \$(RM_F) pod*.tmp pm_to_blib\n};
- $string .= qq{\t\$(NOECHO) \$(PERL) -pi -e "s/<link.*?>//" Bucardo.pm.html bucardo_ctl.html\n};
- $string .= qq{\t\$(NOECHO) \$(PERL) -pi -e "s~\\`\\`(.+?)''~&quot;\\1&quot;~g" Bucardo.pm.html bucardo_ctl.html\n};
- $string .= qq{\t\$(NOECHO) \$(ECHO) Created Bucardo.pm.html and bucardo_ctl.html\n};
+ $string .= qq{\t\$(NOECHO) \$(PERL) -pi -e "s/<link.*?>//" Bucardo.pm.html bucardo.html\n};
+ $string .= qq{\t\$(NOECHO) \$(PERL) -pi -e "s~\\`\\`(.+?)''~&quot;\\1&quot;~g" Bucardo.pm.html bucardo.html\n};
+ $string .= qq{\t\$(NOECHO) \$(ECHO) Created Bucardo.pm.html and bucardo.html\n};
return $string;
}
View
@@ -66,15 +66,15 @@ MANIFEST.SKIP - files that are known to be safe to exclude from the release
Bucardo.pm - The main program. This is the core of Bucardo - everything else supports
this file. Contains a version number in two places.
-bucardo_ctl - The main command-line interface to Bucardo. Contains a version number.
+bucardo - The main command-line interface to Bucardo. Contains a version number.
scripts/* - Various scripts
* Documentation files:
Bucardo.pm.html - generated by "make html" from the POD in Bucardo.pm
-bucardo_ctl.html - generated by "make html" from the POD in bucardo_ctl
+bucardo.html - generated by "make html" from the POD in bucardo
* Supporting files:
@@ -98,13 +98,13 @@ t/03-goat.t - Test goat access methods.
t/04-pushdelta.t - Test pushdelta syncs.
-t/02-monkey_with_db_table.t - Test db manipulation via bucardo_ctl
+t/02-monkey_with_db_table.t - Test db manipulation via bucardo
-t/02-monkey_with_goat_table.t - Test goat manipulation via bucardo_ctl
+t/02-monkey_with_goat_table.t - Test goat manipulation via bucardo
-t/02-monkey_with_herd.t - Test herd manipulation via bucardo_ctl
+t/02-monkey_with_herd.t - Test herd manipulation via bucardo
-t/02-monkey_with_sync_table.t - Test sync manipulation via bucardo_ctl
+t/02-monkey_with_sync_table.t - Test sync manipulation via bucardo
t/05-fullcopy.t - Test fullcopy
@@ -132,7 +132,7 @@ t/15-star.t - Test of star replication scheme
t/98-cleanup.t - Shuts down test databases. Called by "make distclean"
-t/99-perlcritic.t - Uses Perl::Critic to check Bucardo.pm, bucardo_ctl, and all the
+t/99-perlcritic.t - Uses Perl::Critic to check Bucardo.pm, bucardo, and all the
test files (including itself). Requires that TEST_CRITIC is set. It is recommended
that you get all the Perl::Critic policies via Bundle::Perl::Critic::IncludingOptionalDependencies.
@@ -211,8 +211,8 @@ Version numbers are currently set in nine files:
README
Bucardo.pm (two places)
Bucardo.pm.html
-bucardo_ctl
-bucardo_ctl.html
+bucardo
+bucardo.html
bucardo.schema (three places)
Changes
Makefile.PL
@@ -281,7 +281,7 @@ part of the test suite if the right modules are installed.
* Run "perl Makefile.PL"
-* Run "make html". This will create the html docs for Bucardo.pm and bucardo_ctl. Make sure you
+* Run "make html". This will create the html docs for Bucardo.pm and bucardo. Make sure you
git commit them if anything has changed.
* Run "make dist". Double check that the tarball created has the correct version name.
View
14 UPGRADE
@@ -26,7 +26,7 @@ step should be done on some systems as:
sudo make install
-This will replace the existing Bucardo.pm file, the bucardo_ctl script, the
+This will replace the existing Bucardo.pm file, the bucardo script, the
bucardo.schema file, and the associated man pages.
@@ -35,15 +35,15 @@ bucardo.schema file, and the associated man pages.
Because we may be making schema changes, it is safest to stop Bucardo while
the upgrade is performed. This can be done by running:
-./bucardo_ctl stop
+./bucardo stop
3. Upgrade the Bucardo database
-The bucardo_ctl script has an 'upgrade' command that connects to the
+The bucardo script has an 'upgrade' command that connects to the
existing Bucardo database and upgrades the schema as needed.
-./bucardo_ctl upgrade
+./bucardo upgrade
Note:
* This must be run on every Bucardo instance you have (most sites only use one)
@@ -63,18 +63,18 @@ will connect to each remote database and do things like verify that all
bucardo-related functions and tables are installed correctly. The easiest way to
do this is by running:
-./bucardo_ctl validate all
+./bucardo validate all
Alternatively, you can specify one or more syncs like so:
-./bucardo_ctl validate sync1 sync2
+./bucardo validate sync1 sync2
5. Restart Bucardo
The final step is to restart Bucardo:
-./bucardo_ctl start "Upgrade"
+./bucardo start "Upgrade"
It's probably a good idea to check out the Bucardo log at this point and make
sure everything is working properly.
Oops, something went wrong.

0 comments on commit 4c06822

Please sign in to comment.