diff options
Diffstat (limited to 'databases/pgcluster')
| -rw-r--r-- | databases/pgcluster/Makefile | 114 | ||||
| -rw-r--r-- | databases/pgcluster/distinfo | 4 | ||||
| -rw-r--r-- | databases/pgcluster/files/check_pgcluster.pl | 70 | ||||
| -rw-r--r-- | databases/pgcluster/files/check_pgreplicate.pl | 99 | ||||
| -rw-r--r-- | databases/pgcluster/files/patch-configure.in | 26 | ||||
| -rw-r--r-- | databases/pgcluster/files/patch-libpq:replicate.c | 40 | ||||
| -rw-r--r-- | databases/pgcluster/files/patch-pg_proc.h | 11 | ||||
| -rw-r--r-- | databases/pgcluster/files/patch-pgrp:main.c | 154 | ||||
| -rw-r--r-- | databases/pgcluster/files/patch-pgrp:recovery.c | 224 | ||||
| -rw-r--r-- | databases/pgcluster/files/patch-pgrp:replicate.c | 152 | ||||
| -rw-r--r-- | databases/pgcluster/files/pgcluster.in | 58 | ||||
| -rw-r--r-- | databases/pgcluster/files/pglb.in | 35 | ||||
| -rw-r--r-- | databases/pgcluster/files/pgreplicate.in | 37 | ||||
| -rw-r--r-- | databases/pgcluster/files/setup-sshkey.pl | 24 | ||||
| -rw-r--r-- | databases/pgcluster/pkg-descr | 4 | ||||
| -rw-r--r-- | databases/pgcluster/pkg-plist | 92 |
16 files changed, 0 insertions, 1144 deletions
diff --git a/databases/pgcluster/Makefile b/databases/pgcluster/Makefile deleted file mode 100644 index 3791779f5423..000000000000 --- a/databases/pgcluster/Makefile +++ /dev/null @@ -1,114 +0,0 @@ -# New ports collection makefile for: pgcluster -# Date created: 22 Jan 2004 -# Whom: Jun Kuriyama <kuriyama@FreeBSD.org> -# -# $FreeBSD$ - -PORTNAME= pgcluster -PORTVERSION= 1.0.7 -PORTREVISION= 5 -CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_PGSQL} -MASTER_SITE_SUBDIR= source/OLD/v${BASEPGSQL} -DISTNAME= postgresql-base-${BASEPGSQL} -DIST_SUBDIR= postgresql - -PATCH_SITES= http://dist.bsdlab.org/ -PATCHFILES= pgcluster-${PORTVERSION}-patch.bz2 -PATCH_DIST_STRIP= -p0 - -MAINTAINER= ports@FreeBSD.org -COMMENT= The multi-master and synchronous replication system for PostgreSQL - -DEPRECATED= Looks like an abandonware, no more public distfile -EXPIRATION_DATE= 2011-08-01 - -RUN_DEPENDS= rsync:${PORTSDIR}/net/rsync - -WRKSRC?= ${WRKDIR}/postgresql-${BASEPGSQL} -USE_GMAKE= yes -GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf -USERS= pgsql -GROUPS= pgsql -MAKE_FLAGS= # empty -MAKEFILE= # empty -CONFLICTS= postgresql-* -USE_RC_SUBR= pgcluster -USE_LDCONFIG= yes -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+= --enable-debug -INSTALL_TARGET= install -.else -INSTALL_TARGET= install-strip -.endif - -BASEPGSQL= 7.3.6 -.if defined(WITHOUT_PGCLUSTER_REPLICATION) -PGRP= "@comment " -.else -USE_RC_SUBR+= pgreplicate -.endif -.if defined(WITHOUT_PGCLUSTER_LOADBALANCER) -PGLB= "@comment " -.else -USE_RC_SUBR+= pglb -.endif -PLIST_SUB= PGRP=${PGRP} PGLB=${PGLB} - -MAN1= clusterdb.1 createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \ - dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 \ - pg_config.1 pg_controldata.1 pg_ctl.1 pg_dump.1 pg_dumpall.1 \ - pg_resetxlog.1 pg_restore.1 pgtclsh.1 pgtksh.1 \ - postgres.1 postmaster.1 psql.1 vacuumdb.1 -MAN7= abort.7 alter_database.7 alter_group.7 alter_table.7 alter_trigger.7 \ - alter_user.7 analyze.7 begin.7 \ - checkpoint.7 close.7 cluster.7 comment.7 commit.7 copy.7 \ - create_aggregate.7 create_cast.7 create_constraint_trigger.7 \ - create_conversion.7 create_database.7 create_domain.7 \ - create_function.7 create_group.7 create_index.7 create_language.7 \ - create_operator.7 create_operator_class.7 create_rule.7 \ - create_schema.7 create_sequence.7 create_table.7 create_table_as.7 \ - create_trigger.7 create_type.7 create_user.7 create_view.7 \ - deallocate.7 declare.7 delete.7 drop_aggregate.7 drop_cast.7 \ - drop_conversion.7 drop_database.7 drop_domain.7 drop_function.7 \ - drop_group.7 drop_index.7 drop_language.7 drop_operator.7 \ - drop_operator_class.7 drop_rule.7 drop_schema.7 drop_sequence.7 \ - drop_table.7 drop_trigger.7 drop_type.7 drop_user.7 drop_view.7 \ - end.7 execute.7 explain.7 fetch.7 grant.7 insert.7 listen.7 load.7 \ - lock.7 move.7 notify.7 prepare.7 reindex.7 reset.7 revoke.7 \ - rollback.7 select.7 select_into.7 set.7 set_constraints.7 \ - set_session_authorization.7 set_transaction.7 show.7 \ - start_transaction.7 truncate.7 unlisten.7 update.7 vacuum.7 - -post-patch: - ${REINPLACE_CMD} -e 's|^#ifdef HAVE_STRUCT_SOCKCRED$$|#if defined(HAVE_STRUCT_SOCKCRED) \&\& !defined(HAVE_STRUCT_CMSGCRED)|' \ - ${WRKSRC}/src/interfaces/libpq/fe-auth.c - cd ${WRKSRC}/src/pgcluster/pgrp; ${CHMOD} +x configure missing - cd ${WRKSRC}/src/pgcluster/pglb; ${CHMOD} +x configure - -post-build: -.if !defined(WITHOUT_PGCLUSTER_REPLICATION) - ${MAKE} WRKSRC=${WRKSRC}/src/pgcluster/pgrp run-autotools do-configure - ${MAKE} WRKSRC=${WRKSRC}/src/pgcluster/pgrp AUTOCONF=${AUTOCONF} do-build -.endif -.if !defined(WITHOUT_PGCLUSTER_LOADBALANCER) - ${MAKE} WRKSRC=${WRKSRC}/src/pgcluster/pglb run-autotools do-configure - ${MAKE} WRKSRC=${WRKSRC}/src/pgcluster/pglb AUTOCONF=${AUTOCONF} do-build -.endif - -post-install: -.if !defined(WITHOUT_PGCLUSTER_REPLICATION) - ${MAKE} WRKSRC=${WRKSRC}/src/pgcluster/pgrp do-install -.endif -.if !defined(WITHOUT_PGCLUSTER_LOADBALANCER) - ${MAKE} WRKSRC=${WRKSRC}/src/pgcluster/pglb do-install -.endif - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "powerpc" -BROKEN= Does not compile on powerpc -.endif - -.include <bsd.port.post.mk> diff --git a/databases/pgcluster/distinfo b/databases/pgcluster/distinfo deleted file mode 100644 index ba73a09986db..000000000000 --- a/databases/pgcluster/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -SHA256 (postgresql/postgresql-base-7.3.6.tar.gz) = d458a661a637e5b39ce053269ecb0a29f64906bb73393fcd2bc50a535f71b185 -SIZE (postgresql/postgresql-base-7.3.6.tar.gz) = 7147448 -SHA256 (postgresql/pgcluster-1.0.7-patch.bz2) = 17a46c931c6989dfb70c32c0944fbdc5e9c263883b2f566fb55681d3caa7fa68 -SIZE (postgresql/pgcluster-1.0.7-patch.bz2) = 135242 diff --git a/databases/pgcluster/files/check_pgcluster.pl b/databases/pgcluster/files/check_pgcluster.pl deleted file mode 100644 index 8d40d60b75a8..000000000000 --- a/databases/pgcluster/files/check_pgcluster.pl +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/perl -w -# -# Copyright (c) 2004 IMG SRC, Inc. All rights reserved. -# -# $Id: check_pgcluster.pl,v 1.4 2004/03/03 11:51:06 kuriyama Exp $ -# -# Plugin for nagios. -# -# Prepare pgr_current_replicator() function before using. -# -# % psql -U pgsql -d template1 -# template1=# create function pgr_current_replicator () returns text as 'pgr_current_replicator' language internal with (isStrict); -# CREATE FUNCTION -# template1=# -# -# define command{ -# command_name check_pgcluster -# command_line $USER1$/check_pgcluster -H $HOSTADDRESS$ -p $ARG1$ -w $ARG2$ -# } -# -# define service{ -# use generic-service -# host_name cluster1.example.org -# service_description PGCLUSTER -# check_command check_pgcluster!5432!replicator.example.org:8777 -# } - -use strict; -use Getopt::Std; -use DBI; - -my ($ret, %O, @r) = (0); -getopts('H:p:U:P:w:', \%O); - -$O{p} ||= 5432; -$O{U} ||= ""; -$O{P} ||= ""; -usage() if (not $O{H} or not $O{w}); - -my $dbh = DBI->connect("dbi:Pg:dbname=template1;host=$O{H};port=$O{p}", - $O{U}, $O{P}, { PrintError => 0 }); - -if ($dbh) { - my $sth = $dbh->prepare("select pgr_current_replicator()") or die; - $sth->execute or die; - @r = $sth->fetchrow_array; - $sth->finish; - - $dbh->disconnect; - - if (not defined $r[0] or length($r[0]) < 1) { - $ret = 2; - } elsif ($r[0] ne $O{w}) { - $ret = 1; - } - -} else { - $ret = 2; -} - -my %STATUS = (2 => "CRITICAL", 1 => "WARNING", 0 => "OK"); -printf "PGCLUSTER %s: %s\n", $STATUS{$ret}, $r[0] || ""; -exit $ret; - -# ============================================================ -sub usage { - print "Usage: check_pgcluster -H host [-p dbport] [-U dbuser] [-P dbpass] -w <primary replication server:port>\n"; - exit(3); -} - diff --git a/databases/pgcluster/files/check_pgreplicate.pl b/databases/pgcluster/files/check_pgreplicate.pl deleted file mode 100644 index bda8010840ab..000000000000 --- a/databases/pgcluster/files/check_pgreplicate.pl +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/perl -w -# -# Copyright (c) 2004 IMG SRC, Inc. All rights reserved. -# -# $Id: check_pgreplicate.pl,v 1.2 2004/04/16 12:10:53 kuriyama Exp $ -# -# Plugin for nagios. -# -# define command{ -# command_name check_pgreplicate -# command_line $USER1$/check_pgreplicate -H $HOSTADDRESS$ -p $ARG1$ -w $ARG2$ -c $ARG3$ -# } -# -# # Declare cluster which has 2 pgcluster instances. -# # Send a warning if usable pgcluster is under 2. -# # Send a critical if usable pgcluster is under 1. -# define service{ -# use generic-service -# host_name replicator.example.org -# service_description PGREPLICATE -# check_command check_pgreplicate!8777!2!1 -# } - -use strict; -use Getopt::Std; -use IO::Socket::INET; - -my %O; -getopts('H:p:w:c:v', \%O); - -my $w = $O{w}; -my $c = $O{c}; -usage() if (not $w or not $c); - -my $host = sprintf("%s:%d", $O{H} || "localhost", $O{p} || 8777); -my $sock = IO::Socket::INET->new($host) or die "$!"; - -my $HOSTNAME_MAX_LENGTH = 128; -my $DBNAME_MAX_LENGTH = 128; -my $USERNAME_MAX_LENGTH = 128; - -# typedef struct ReplicateHeaderType -# { -# char cmdSys; -# char cmdSts; -# char cmdType; -# char dummy; -# char port[INT_LENGTH]; -# char pid[INT_LENGTH]; -# char query_size[INT_LENGTH]; -# char except_host[HOSTNAME_MAX_LENGTH]; -# char from_host[HOSTNAME_MAX_LENGTH]; -# char dbName[DBNAME_MAX_LENGTH]; -# char userName[USERNAME_MAX_LENGTH]; -# struct timeval tv; -# } ReplicateHeader; -my $query = "dummy"; -my $packet = pack "CCCCa12a12a12a128a128a128a128ll", 0, 0, ord("o"), 0, - "0", "0", "5", "except host", "from host", "db name", "user name", - time, 0; - -print $sock $packet; -print $sock $query; - -my ($use, @Host, %tmp) = (0); -while (<$sock>) { - chomp; - if ($_ eq "") { - push @Host, { %tmp }; - $use++ if ($tmp{useFlag} == 2); - %tmp = (); - } else { - my ($var, $val) = split(/=/, $_, 2); - $tmp{$var} = $val; - } -} -close($sock); - -my $ret = 0; -if ($use < $O{c}) { - $ret = 2; -} elsif ($use < $O{w}) { - $ret = 1; -} -my %STATUS = (2 => "CRITICAL", 1 => "WARNING", 0 => "OK"); -printf "PGREPLICATE %s: %d hosts active\n", $STATUS{$ret}, $use; -if ($O{v}) { - foreach (@Host) { - printf "%s:%d, useFlag=%d, recoveryPort=%d\n", - $_->{hostName}, $_->{port}, $_->{useFlag}, $_->{recoveryPort}; - } -} -exit $ret; - -# ============================================================ -sub usage { - print "Usage: check_pgreplicate -H host -p port -w <warn> -c <crit> [-v]\n"; - exit(3); -} diff --git a/databases/pgcluster/files/patch-configure.in b/databases/pgcluster/files/patch-configure.in deleted file mode 100644 index ad55a81b3cd7..000000000000 --- a/databases/pgcluster/files/patch-configure.in +++ /dev/null @@ -1,26 +0,0 @@ ---- configure.in.orig Tue Mar 2 08:44:53 2004 -+++ configure.in Mon Jul 16 16:20:48 2007 -@@ -19,11 +19,7 @@ - dnl - dnl The GNU folks apparently haven't heard that some people don't use - dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir". --m4_define([info], [doc]) --m4_define([infodir], [docdir]) - AC_INIT([PostgreSQL], [7.3.6], [pgsql-bugs@postgresql.org]) --m4_undefine([infodir]) --m4_undefine([info]) - AC_SUBST(docdir) - - AC_PREREQ(2.53) -@@ -506,6 +502,11 @@ - ]) - - AC_SUBST(with_openssl) -+ -+# -+# Replication -+# -+AC_DEFINE([USE_REPLICATION], 1, [Define to build with Replication support]) - - - # diff --git a/databases/pgcluster/files/patch-libpq:replicate.c b/databases/pgcluster/files/patch-libpq:replicate.c deleted file mode 100644 index a0ab5f1fa713..000000000000 --- a/databases/pgcluster/files/patch-libpq:replicate.c +++ /dev/null @@ -1,40 +0,0 @@ ---- src/backend/libpq/replicate.c 9 May 2004 11:21:32 -0000 1.1.1.12 -+++ src/backend/libpq/replicate.c 9 May 2004 11:51:34 -0000 1.7 -@@ -637,6 +637,7 @@ - return NULL; - } - sock = get_replicate_server_socket( sp , socket_type); -+ elog(DEBUG1, "get_replicate_server_socket() returns %d", sock); - if (sock < 0) - { - if (Debug_pretty_print) -@@ -2183,4 +2184,29 @@ - free(result); - return false; - } -+ -+extern Datum pgr_current_replicator(PG_FUNCTION_ARGS); -+PG_FUNCTION_INFO_V1(pgr_current_replicator); -+ -+Datum -+pgr_current_replicator(PG_FUNCTION_ARGS) -+{ -+ int len; -+ char buf[HOSTNAME_MAX_LENGTH + 6]; -+ text *result; -+ ReplicateServerInfo *sp; -+ -+ sp = PGR_get_replicate_server_info(); -+ if (sp == NULL) { -+ PG_RETURN_NULL(); -+ } -+ len = snprintf(buf, sizeof(buf), "%s:%d", -+ sp->hostName, sp->portNumber); -+ result = palloc(VARHDRSZ + len); -+ VARATT_SIZEP(result) = VARHDRSZ + len; -+ memcpy(VARDATA(result), buf, len); -+ -+ PG_RETURN_TEXT_P(result); -+} -+ - #endif /* USE_REPLICATION */ diff --git a/databases/pgcluster/files/patch-pg_proc.h b/databases/pgcluster/files/patch-pg_proc.h deleted file mode 100644 index 0dbd06e9b515..000000000000 --- a/databases/pgcluster/files/patch-pg_proc.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/include/catalog/pg_proc.h 27 Feb 2004 11:57:12 -0000 1.1.1.1 -+++ src/include/catalog/pg_proc.h 6 Apr 2004 12:44:53 -0000 1.2 -@@ -3117,6 +3117,8 @@ - DATA(insert OID = 2307 ( opaque_out PGNSP PGUID 12 f f t f i 1 2275 "2282" opaque_out - _null_ )); - DESCR("(internal)"); - -+DATA(insert OID = 2400 ( pgr_current_replicator PGNSP PGUID 12 f f t f v 0 25 "" pgr_current_replicator - _null_ )); -+DESCR("Current replication server"); - - /* - * Symbolic values for provolatile column: these indicate whether the result diff --git a/databases/pgcluster/files/patch-pgrp:main.c b/databases/pgcluster/files/patch-pgrp:main.c deleted file mode 100644 index 21e6ee940208..000000000000 --- a/databases/pgcluster/files/patch-pgrp:main.c +++ /dev/null @@ -1,154 +0,0 @@ ---- src/pgcluster/pgrp/main.c 9 May 2004 11:21:36 -0000 1.1.1.10 -+++ src/pgcluster/pgrp/main.c 9 May 2004 12:57:57 -0000 1.8 -@@ -133,6 +133,43 @@ - static void child_wait(SIGNAL_ARGS); - static void usage(void); - -+static void -+dump_status(int fd) -+{ -+ HostTbl *host = Host_Tbl_Begin; -+ while (host->useFlag != DB_TBL_END) { -+ char buf[256]; -+ const char *flag = buf; -+ if (host->useFlag == DB_TBL_FREE) { -+ flag = "FREE"; -+ } else if (host->useFlag == DB_TBL_INIT) { -+ flag = "INIT"; -+ } else if (host->useFlag == DB_TBL_USE) { -+ flag = "USE"; -+ } else if (host->useFlag == DB_TBL_ERROR) { -+ flag = "ERROR"; -+ } else { -+ snprintf(buf, sizeof(buf), "UNKNOWN(%d)", host->useFlag); -+ } -+ show_debug("%s:%d flag=%s, recoveryPort=%d", -+ host->hostName, host->port, flag, host->recoveryPort); -+ -+ snprintf(buf, sizeof(buf), "hostNum=%d\n", host->hostNum); -+ write(fd, buf, strlen(buf)); -+ snprintf(buf, sizeof(buf), "hostName=%s\n", host->hostName); -+ write(fd, buf, strlen(buf)); -+ snprintf(buf, sizeof(buf), "port=%d\n", host->port); -+ write(fd, buf, strlen(buf)); -+ snprintf(buf, sizeof(buf), "useFlag=%d\n", host->useFlag); -+ write(fd, buf, strlen(buf)); -+ snprintf(buf, sizeof(buf), "recoveryPort=%d\n", host->recoveryPort); -+ write(fd, buf, strlen(buf)); -+ write(fd, "\n", strlen("\n")); -+ -+ host++; -+ } -+} -+ - /*-------------------------------------------------------------------- - * SYMBOL - * replicate_loop() -@@ -170,11 +207,11 @@ - } - if (pid == 0) - { -- signal(SIGHUP, quick_exit); -- signal(SIGINT, quick_exit); -- signal(SIGQUIT, quick_exit); -- signal(SIGTERM, quick_exit); -- signal(SIGALRM, quick_exit); -+ signal(SIGHUP, quick_exit); -+ signal(SIGINT, quick_exit); -+ signal(SIGQUIT, quick_exit); -+ signal(SIGTERM, quick_exit); -+ signal(SIGALRM, quick_exit); - setpgid(0,pgid); - - /* child loop */ -@@ -192,16 +229,23 @@ - FD_ZERO(&rmask); - FD_SET(sock,&rmask); - rtn = select(sock+1, &rmask, (fd_set *)NULL, (fd_set *)NULL, &timeout); -+ if (rtn < 0) { -+ show_debug("select() = %d (%s)", rtn, strerror(errno)); -+ } - if (rtn && FD_ISSET(sock, &rmask)) - { -- show_debug("replicate_loop selected\n"); -+ show_debug("replicate_loop selected (sock=%d)", sock); - query = NULL; - query = PGRread_packet(sock,&header); -- if (query == NULL) -+ if (query == NULL && errno != 0) - { - show_error("session closed"); - break; - } -+ if (header.cmdType == 'o') { -+ dump_status(sock); -+ break; -+ } - if (header.cmdSts == 0) - { - break; -@@ -247,7 +291,7 @@ - } - } - --static void -+void - startup_replication_server(void) - { - ReplicateHeader header; -@@ -301,7 +345,7 @@ - { - PGRreplicate_exit(0); - } -- show_debug("replicate main %d port bind OK \n",Port_Number); -+ show_debug("replicate main %d port bind OK",Port_Number); - - /* cascade start up notice */ - if (Cascade_Inf->upper != NULL) -@@ -326,11 +370,14 @@ - */ - FD_ZERO(&rmask); - FD_SET(fd,&rmask); -- show_debug("wait replicate\n"); -+ show_debug("wait replicate"); - rtn = select(fd+1, &rmask, (fd_set *)NULL, (fd_set *)NULL, &timeout); -+ if (rtn < 0) { -+ show_debug("select() = %d (%s)", rtn, strerror(errno)); -+ } - if (rtn && FD_ISSET(fd, &rmask)) - { -- show_debug("replicate main: selected\n"); -+ show_debug("replicate main: selected (fd=%d)", fd); - /* - * get recovery status. - */ -@@ -685,12 +732,12 @@ - - if (PGRset_Conf_Data(PGR_Data_Path) != STATUS_OK) - { -- show_debug("PGRset_Conf_Data error\n"); -+ show_debug("PGRset_Conf_Data error"); - PGRreplicate_exit(0); - } - if (PGRinit_recovery() != STATUS_OK) - { -- show_debug("PGRinit_recovery error\n"); -+ show_debug("PGRinit_recovery error"); - PGRreplicate_exit(0); - } - pgid = getpgid(0); -@@ -702,10 +749,10 @@ - } - if (pid == 0) - { -- signal(SIGHUP, quick_exit); -- signal(SIGINT, quick_exit); -- signal(SIGQUIT, quick_exit); -- signal(SIGTERM, quick_exit); -+ signal(SIGHUP, quick_exit); -+ signal(SIGINT, quick_exit); -+ signal(SIGQUIT, quick_exit); -+ signal(SIGTERM, quick_exit); - /* - * in child process, - * call recovery module diff --git a/databases/pgcluster/files/patch-pgrp:recovery.c b/databases/pgcluster/files/patch-pgrp:recovery.c deleted file mode 100644 index ad2b2865d29f..000000000000 --- a/databases/pgcluster/files/patch-pgrp:recovery.c +++ /dev/null @@ -1,224 +0,0 @@ ---- src/pgcluster/pgrp/recovery.c.orig Thu Jun 24 22:08:25 2004 -+++ src/pgcluster/pgrp/recovery.c Thu Jun 24 22:08:25 2004 -@@ -121,7 +121,7 @@ - int packet_size = 0; - - /* set function name */ -- set_function("read_packet"); -+ set_function("recovery::read_packet"); - - read_ptr = (char*)packet; - packet_size = sizeof(RecoveryPacket); -@@ -140,7 +140,7 @@ - } - read_size += r; - if (read_size == packet_size){ -- show_debug("receive packet\n"); -+ show_debug("receive packet"); - show_recovery_packet(packet); - return r; - } -@@ -166,7 +166,7 @@ - */ - FD_ZERO(&rmask); - FD_SET(host->sock,&rmask); -- show_debug("wait\n"); -+ show_debug("wait"); - for(;;) - { - rtn = select(host->sock+1, &rmask, (fd_set *)NULL, (fd_set *)NULL, &timeout); -@@ -227,7 +227,7 @@ - { - if (count > MAX_RETRY_TIMES ) - { -- show_error("PGR_Create_Socket_Connect failed"); -+ show_error("PGR_Create_Socket_Connect(%d, %s, %d) failed", host->sock, host->hostName, host->recoveryPort); - return STATUS_ERROR; - } - count ++; -@@ -331,18 +331,18 @@ - Target->port = ntohs(packet->port); - Target->recoveryPort = ntohs(packet->recoveryPort); - Target->sock = *sock; -- show_debug("1st setup target %s\n",Target->hostName); -- show_debug("1st setup port %d\n",Target->port); -+ show_debug("1st setup target %s",Target->hostName); -+ show_debug("1st setup port %d",Target->port); - /* - * check another recovery process - */ -- show_debug("check another recovery process\n"); -+ show_debug("check another recovery process"); - if (PGRget_recovery_status() != RECOVERY_INIT) - { - /* - * recovery process is already running - */ -- show_debug(" already recovery job runing\n"); -+ show_debug(" already recovery job runing"); - memset(packet,0,sizeof(packet)); - PGRset_recovery_packet_no(packet, RECOVERY_ERROR_OCCUPIED) ; - status = send_packet(Target,packet); -@@ -352,7 +352,7 @@ - /* - * add recovery target to host table - */ -- show_debug("add recovery target to host table\n"); -+ show_debug("add recovery target to host table (%s)", packet->hostName); - memcpy(host_tbl.hostName,packet->hostName,sizeof(host_tbl.hostName)); - host_tbl.port = ntohs(packet->port); - PGRset_recovered_host(&host_tbl,DB_TBL_INIT); -@@ -365,7 +365,7 @@ - /* - * set RECOVERY_PGDATA_REQ packet data - */ -- show_debug("set RECOVERY_PGDATA_REQ packet data\n"); -+ show_debug("set RECOVERY_PGDATA_REQ packet data"); - memset(packet,0,sizeof(RecoveryPacket)); - PGRset_recovery_packet_no(packet, RECOVERY_PGDATA_REQ ); - -@@ -376,7 +376,7 @@ - /* - * connection error , master may be down - */ -- show_error("get master info error , master may be down\n"); -+ show_error("get master info error , master may be down"); - PGRset_recovery_packet_no(packet, RECOVERY_ERROR_CONNECTION); - status = send_packet(Target, packet); - reset_recovery_prepare(); -@@ -387,18 +387,18 @@ - Master->sock = -1; - Master->port = master->port; - Master->recoveryPort = master->recoveryPort; -- show_debug("send packet to master %s recoveryPort %d\n",Master->hostName, Master->recoveryPort); -+ show_debug("send packet to master %s recoveryPort %d",Master->hostName, Master->recoveryPort); - status = send_packet(Master, packet); - if (status != STATUS_OK) - { - /* - * connection error , master may be down - */ -- show_error("connection error , master may be down\n"); -+ show_error("connection error , master may be down"); - PGRset_host_status(master,DB_TBL_ERROR); - goto retry_connect_master ; - } -- -+ - /* - * start prepare of recovery - * set recovery status to "prepare start" -@@ -408,10 +408,10 @@ - /* - * wait answer from master server - */ -- show_debug("wait answer from master server\n"); -+ show_debug("wait answer from master server"); - memset(packet,0,sizeof(RecoveryPacket)); - read_packet_from_master(Master, packet); -- show_debug("get answer from master\n"); -+ show_debug("get answer from master"); - if (ntohs(packet->packet_no) == RECOVERY_PGDATA_ANS) - { - /* -@@ -454,7 +454,7 @@ - status = PGRwait_transaction_count_clear(); - if (status != STATUS_OK) - { -- show_error("transaction is too busy, please try again after\n"); -+ show_error("transaction is too busy, please try again after"); - PGRset_recovery_packet_no(packet, RECOVERY_ERROR_CONNECTION); - status = send_packet(Target,packet); - status = send_packet(Master,packet); -@@ -472,7 +472,7 @@ - /* - * connection error , master may be down - */ -- show_error("connection error , master may be down\n"); -+ show_error("connection error , master may be down"); - PGRset_recovery_packet_no(packet, RECOVERY_ERROR_CONNECTION); - status = send_packet(Target,packet); - status = send_packet(Master,packet); -@@ -501,7 +501,7 @@ - } - else - { -- show_debug("failer answer returned\n"); -+ show_debug("failer answer returned"); - PGRset_recovery_packet_no(packet, RECOVERY_ERROR_CONNECTION); - status = send_packet(Target,packet); - status = send_packet(Master,packet); -@@ -531,23 +531,23 @@ - - if (master == (RecoveryTbl *)NULL) - { -- show_error("there is no master "); -+ show_error("there is no master"); - return STATUS_ERROR; - } -- show_debug("master %s - %d\n",master->hostName,master->port); -+ show_debug("master %s - %d",master->hostName,master->port); - master_ptr = PGRget_HostTbl(master->hostName,master->port); - if (master_ptr == (HostTbl *)NULL) - { -- show_error("master table is null\n"); -+ show_error("master table is null"); - return STATUS_ERROR; - } - if (target != (RecoveryTbl *)NULL) - { -- show_debug("target %s - %d\n",target->hostName,target->port); -+ show_debug("target %s - %d",target->hostName,target->port); - target_ptr = PGRget_HostTbl(target->hostName,target->port); - if (target_ptr == (HostTbl *)NULL) - { -- show_error("target table is null\n"); -+ show_error("target table is null"); - return STATUS_ERROR; - } - } -@@ -617,7 +617,7 @@ - { - free(msg_header); - } -- show_debug("send_queue return status %d\n",status); -+ show_debug("send_queue return status %d",status); - return status; - } - -@@ -638,7 +638,7 @@ - set_function("pgrecovery_loop"); - - count = 0; -- show_debug("recovery accept port %d\n",Recovery_Port_Number); -+ show_debug("recovery accept port %d",Recovery_Port_Number); - while ((status = PGR_Create_Acception(fd,&sock,"",Recovery_Port_Number)) != STATUS_OK) - { - show_error("PGR_Create_Acception failed"); -@@ -678,7 +678,7 @@ - continue; - } - -- show_debug("receive packet no:%d\n",ntohs(packet.packet_no)); -+ show_debug("receive packet no:%d",ntohs(packet.packet_no)); - - switch (ntohs(packet.packet_no)) - { -@@ -736,7 +736,7 @@ - status = send_packet(&Target,&packet); - } - /* -- * stop queueing, and initiarise recovery status -+ * stop queueing, and initialise recovery status - */ - finish_recovery(); - loop_end = true; -@@ -749,7 +749,7 @@ - memset((char *)&MasterPacketData,0,sizeof(RecoveryPacket)); - break; - case RECOVERY_ERROR_ANS : -- show_debug("recovery error accept. top queueing and initiarse recovery status\n"); -+ show_debug("recovery error accept. top queueing and initialise recovery status"); - status = PGRsend_queue(&Master,NULL); - memset(&packet,0,sizeof(RecoveryPacket)); - PGRset_recovery_packet_no(&packet, RECOVERY_ERROR_ANS); diff --git a/databases/pgcluster/files/patch-pgrp:replicate.c b/databases/pgcluster/files/patch-pgrp:replicate.c deleted file mode 100644 index 8d3c0ae82abb..000000000000 --- a/databases/pgcluster/files/patch-pgrp:replicate.c +++ /dev/null @@ -1,152 +0,0 @@ ---- src/pgcluster/pgrp/replicate.c.orig Thu Jun 24 22:12:48 2004 -+++ src/pgcluster/pgrp/replicate.c Thu Jun 24 22:20:38 2004 -@@ -237,6 +237,7 @@ - show_error("insertTransactionTbl failed"); - return (TransactionTbl *)NULL; - } -+ show_debug("setTransactionTbl return %p (hostIP=%08x, port=%d, srcHostIP=%08x", ptr, work.hostIP, work.port, work.srcHostIP); - return ptr; - } - -@@ -386,8 +387,10 @@ - set_function("PGRadd_HostTbl"); - - ptr = PGRget_HostTbl(conf_data->hostName, conf_data->port); -+ set_function("PGRadd_HostTbl"); - if (ptr != (HostTbl*)NULL) - { -+ show_debug("found ptr"); - PGRset_host_status(ptr,useFlag); - return ptr; - } -@@ -411,6 +414,7 @@ - { - (ptr + 1) -> useFlag = DB_TBL_END; - } -+ show_debug("not found, allocate new one"); - ptr->hostNum = cnt; - memcpy(ptr->hostName,conf_data->hostName,sizeof(ptr->hostName)); - ptr->port = conf_data->port; -@@ -429,14 +433,17 @@ - set_function("PGRget_master"); - - host_tbl = Host_Tbl_Begin; -+ show_debug("start get_master loop"); - while(host_tbl->useFlag != DB_TBL_END) - { - if (host_tbl->useFlag == DB_TBL_USE) - { -+ show_debug("found master"); - return host_tbl; - } - host_tbl ++; - } -+ show_debug("not found master"); - return (HostTbl *)NULL; - } - -@@ -451,6 +458,9 @@ - PGRsem_lock(SemID,SEM_NUM_OF_RECOVERY); - if (Recovery_Status_Inf != (RecoveryStatusInf *)NULL) - { -+ if (Recovery_Status_Inf->recovery_status != status) { -+ show_debug("status change %d -> %d", Recovery_Status_Inf->recovery_status, status); -+ } - Recovery_Status_Inf->recovery_status = status; - } - PGRsem_unlock(SemID,SEM_NUM_OF_RECOVERY); -@@ -629,6 +639,8 @@ - if (target != (HostTbl*)NULL) - { - memcpy((HostTbl *)&(Recovery_Status_Inf->target_host),target,sizeof(HostTbl)); -+ set_function("PGRset_recovered_host"); -+ show_debug("status=%d", useFlag); - PGRset_host_status(target,useFlag); - } - -@@ -845,6 +857,7 @@ - { - return STATUS_ERROR; - } -+ show_debug("hostName=%s, port=%d, recoveryPort=%d, hostNum=%d, useFlag=%d", host_ptr->hostName, host_ptr->port, host_ptr->recoveryPort, host_ptr->hostNum, host_ptr->useFlag); - if (host_ptr->useFlag != status) - { - host_ptr->useFlag = status; -@@ -1028,6 +1041,7 @@ - } - conn = transaction_tbl->conn; - -+ set_function("PGRsend_replicate_packet_to_server"); - if (conn == NULL) - { - show_error("[%d@%s] may be down",host_ptr->port,host_ptr->hostName); -@@ -1268,6 +1282,7 @@ - - len = strlen(hostName); - ptr = Host_Tbl_Begin; -+ show_debug("hostName=%s, port=%d", hostName, port); - if (len > sizeof(ptr->hostName)) - { - len = sizeof(ptr->hostName); -@@ -1709,7 +1724,7 @@ - gettimeofday(&tv,NULL); - header->tv.tv_sec = htonl(tv.tv_sec); - header->tv.tv_usec = htonl(tv.tv_usec); -- show_debug("query :: %s\n",query); -+ show_debug("query :: %s",query); - - /* save header for logging */ - if (is_need_sync_time(header) == true) -@@ -1965,18 +1980,18 @@ - /* set function name */ - set_function("PGRreplicate_packet_send"); - -- show_debug("cmdSts=%c\n",header->cmdSts); -- show_debug("cmdType=%c\n",header->cmdType); -- show_debug("port=%d\n",ntohs(header->port)); -- show_debug("pid=%d\n",ntohs(header->pid)); -- show_debug("except_host=%s\n",header->except_host); -- show_debug("from_host=%s\n",header->from_host); -- show_debug("dbName=%s\n",header->dbName); -- show_debug("userName=%s\n",header->userName); -- show_debug("recieve sec=%u\n",ntohl(header->tv.tv_sec)); -- show_debug("recieve usec=%u\n",ntohl(header->tv.tv_usec)); -- show_debug("query_size=%d\n",ntohl(header->query_size)); -- show_debug("query=%s\n",query); -+ show_debug("cmdSts=%c",header->cmdSts); -+ show_debug("cmdType=%c",header->cmdType); -+ show_debug("port=%d",ntohs(header->port)); -+ show_debug("pid=%d",ntohs(header->pid)); -+ show_debug("except_host=%s",header->except_host); -+ show_debug("from_host=%s",header->from_host); -+ show_debug("dbName=%s",header->dbName); -+ show_debug("userName=%s",header->userName); -+ show_debug("recieve sec=%u",ntohl(header->tv.tv_sec)); -+ show_debug("recieve usec=%u",ntohl(header->tv.tv_usec)); -+ show_debug("query_size=%d",ntohl(header->query_size)); -+ show_debug("query=%s",query); - - /* - * loop while registrated cluster DB exist -@@ -2004,7 +2019,7 @@ - */ - if (is_master_in_recovery(ptr->hostName, ptr->port) == true) - { -- show_debug("%s skipped\n",ptr->hostName); -+ show_debug("%s skipped",ptr->hostName); - ptr ++; - continue; - } -@@ -2228,10 +2243,10 @@ - set_function("PGRreplicate_packet_send_each_server"); - - host = ptr->hostName; -- show_debug("except:%d@%s host:%d@%s\n", -+ show_debug("except:%d@%s host:%d@%s", - ntohs(header->port),header->except_host, - ptr->port,ptr->hostName); -- show_debug("send replicate to:%s\n",host); -+ show_debug("send replicate to:%s",host); - /* - * send query to cluster DB - */ diff --git a/databases/pgcluster/files/pgcluster.in b/databases/pgcluster/files/pgcluster.in deleted file mode 100644 index cfc9216be57b..000000000000 --- a/databases/pgcluster/files/pgcluster.in +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: /tmp/pcvs/ports/databases/pgcluster/files/Attic/pgcluster.in,v 1.3 2010-03-27 00:12:48 dougb Exp $ -# -# PROVIDE: pgcluster -# REQUIRE: DAEMON -# BEFORE: pgreplicate -# -# Add the following line to /etc/rc.conf to enable pgcluster: -# -# pgcluster_enable="YES" -# # optional -# pgcluster_data="/home/pgsql/data" -# pgcluster_flags="-w -s" -# - -. /etc/rc.subr - -name="pgcluster" -rcvar=`set_rcvar` - -command=%%PREFIX%%/bin/pg_ctl - -load_rc_config ${name} - -: ${pgcluster_enable="NO"} -: ${pgcluster_data="%%PREFIX%%/pgsql/data"} -: ${pgcluster_flags="-w -s"} - -pgcluster_user=pgsql -pgcluster_flags="${pgcluster_flags} -D ${pgcluster_data}" -pidfile="${pgcluster_data}/postmaster.pid" - -extra_commands="initdb recover" - -initdb_cmd="pgcluster_initdb" -recover_cmd="pgcluster_recover" -start_cmd="pgcluster_start" -stop_cmd="pgcluster_stop" - -pgcluster_start() -{ - su -m ${pgcluster_user} -c "exec ${command} start ${pgcluster_flags} -o '-i'" -} -pgcluster_stop() -{ - su -m ${pgcluster_user} -c "exec ${command} stop ${pgcluster_flags} -m i" -} -pgcluster_recover() -{ - su -m ${pgcluster_user} -c "exec ${command} start ${pgcluster_flags} -o '-i -R'" -} -pgcluster_initdb() -{ - su -m ${pgcluster_user} -c "exec %%PREFIX%%/bin/initdb -D ${pgcluster_data}" -} - -run_rc_command "$1" diff --git a/databases/pgcluster/files/pglb.in b/databases/pgcluster/files/pglb.in deleted file mode 100644 index 11a60b985071..000000000000 --- a/databases/pgcluster/files/pglb.in +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: /tmp/pcvs/ports/databases/pgcluster/files/Attic/pglb.in,v 1.3 2010-03-27 00:12:48 dougb Exp $ -# -# PROVIDE: pglb -# REQUIRE: DAEMON -# -# Add the following line to /etc/rc.conf to enable pglb: -# -# pglb_enable="YES" -# - -. /etc/rc.subr - -name="pglb" -rcvar=`set_rcvar` - -command=%%PREFIX%%/bin/${name} - -load_rc_config $name - -: ${pglb_enable="NO"} -: ${pglb_data="%%PREFIX%%/pgsql/data"} - -pglb_user=pgsql -pglb_flags="${pglb_flags} -D ${pglb_data}" - -stop_cmd="pglb_stop" - -pglb_stop() -{ - su -m ${pglb_user} -c "exec ${command} -D ${pglb_data} stop" -} - -run_rc_command "$1" diff --git a/databases/pgcluster/files/pgreplicate.in b/databases/pgcluster/files/pgreplicate.in deleted file mode 100644 index 977229b839ab..000000000000 --- a/databases/pgcluster/files/pgreplicate.in +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: /tmp/pcvs/ports/databases/pgcluster/files/Attic/pgreplicate.in,v 1.3 2010-03-27 00:12:48 dougb Exp $ -# -# PROVIDE: pgreplicate -# REQUIRE: DAEMON -# BEFORE: pglb -# -# Add the following line to /etc/rc.conf to enable pgreplicate: -# -# pgreplicate_enable="YES" -# - -. /etc/rc.subr - -name="pgreplicate" -rcvar=`set_rcvar` - -command=%%PREFIX%%/bin/${name} - -load_rc_config $name - -: ${pgreplicate_enable="NO"} -: ${pgreplicate_data="%%PREFIX%%/pgsql/data"} - -pgreplicate_user=pgsql -pgreplicate_flags="${pgreplicate_flags} -D ${pgreplicate_data}" -pidfile="${pgreplicate_data}/${name}.pid" - -stop_cmd="pgreplicate_stop" - -pgreplicate_stop() -{ - su -m ${pgreplicate_user} -c "exec ${command} -D ${pgreplicate_data} stop" -} - -run_rc_command "$1" diff --git a/databases/pgcluster/files/setup-sshkey.pl b/databases/pgcluster/files/setup-sshkey.pl deleted file mode 100644 index 11c3a034de1b..000000000000 --- a/databases/pgcluster/files/setup-sshkey.pl +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/perl -w -# -# $FreeBSD$ - -use strict; - -my $base = "$ENV{HOME}/.ssh"; -foreach (@ARGV) { - my $dir = "$base/$_"; - system("mkdir -p $dir") == 0 or die; - if (not -r "$dir/id_dsa.pub") { - system("ssh-keygen -t dsa -N '' -C $ENV{USER}\@$_ -f $dir/id_dsa") == 0 - or die - } - system("ssh-keyscan -t dsa $_ >> $base/known_hosts") == 0 or die; - system("sort $base/known_hosts | uniq > $base/tmp.$$") == 0 or die; - system("mv $base/tmp.$$ $base/known_hosts") == 0 or die; -} -foreach (@ARGV) { - my $dir = "$base/$_"; - system("cat $base/*/id_dsa.pub > $dir/authorized_keys") == 0 or die; - system("cp $base/known_hosts $dir/known_hosts") == 0 or die; -} - diff --git a/databases/pgcluster/pkg-descr b/databases/pgcluster/pkg-descr deleted file mode 100644 index 2eb61809a7d7..000000000000 --- a/databases/pgcluster/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -PGCluster is a multi-master and synchronous replication system that -supports load balancing of PostgreSQL. - -WWW: http://www.csra.co.jp/~mitani/jpug/pgcluster/ diff --git a/databases/pgcluster/pkg-plist b/databases/pgcluster/pkg-plist deleted file mode 100644 index 23dcaad9ab88..000000000000 --- a/databases/pgcluster/pkg-plist +++ /dev/null @@ -1,92 +0,0 @@ -bin/clusterdb -bin/createdb -bin/createlang -bin/createuser -bin/dropdb -bin/droplang -bin/dropuser -bin/ecpg -bin/initdb -bin/initlocation -bin/ipcclean -bin/pg_config -bin/pg_controldata -bin/pg_ctl -bin/pg_dump -bin/pg_dumpall -bin/pg_encoding -bin/pg_id -bin/pg_resetxlog -bin/pg_restore -%%PGLB%%bin/pglb -%%PGRP%%bin/pgreplicate -bin/postgres -bin/postmaster -bin/psql -bin/vacuumdb -%%PGLB%%etc/pglb.conf.sample -%%PGRP%%etc/pgreplicate.conf.sample -include/ecpgerrno.h -include/ecpglib.h -include/ecpgtype.h -include/libpq-fe.h -include/libpq/libpq-fs.h -include/pg_config.h -include/pg_config_os.h -include/postgres_ext.h -include/postgresql/internal/c.h -include/postgresql/internal/lib/dllist.h -include/postgresql/internal/libpq-int.h -include/postgresql/internal/libpq/pqcomm.h -include/postgresql/internal/postgres_fe.h -include/postgresql/internal/pqexpbuffer.h -include/sql3types.h -include/sqlca.h -lib/libecpg.a -lib/libecpg.so -lib/libecpg.so.3 -lib/libpq.a -lib/libpq.so -lib/libpq.so.3 -lib/postgresql/ascii_and_mic.so -lib/postgresql/cyrillic_and_mic.so -lib/postgresql/euc_cn_and_mic.so -lib/postgresql/euc_jp_and_sjis.so -lib/postgresql/euc_kr_and_mic.so -lib/postgresql/euc_tw_and_big5.so -lib/postgresql/latin2_and_win1250.so -lib/postgresql/latin_and_mic.so -lib/postgresql/plpgsql.so -lib/postgresql/utf8_and_ascii.so -lib/postgresql/utf8_and_big5.so -lib/postgresql/utf8_and_cyrillic.so -lib/postgresql/utf8_and_euc_cn.so -lib/postgresql/utf8_and_euc_jp.so -lib/postgresql/utf8_and_euc_kr.so -lib/postgresql/utf8_and_euc_tw.so -lib/postgresql/utf8_and_gb18030.so -lib/postgresql/utf8_and_gbk.so -lib/postgresql/utf8_and_iso8859.so -lib/postgresql/utf8_and_iso8859_1.so -lib/postgresql/utf8_and_johab.so -lib/postgresql/utf8_and_sjis.so -lib/postgresql/utf8_and_tcvn.so -lib/postgresql/utf8_and_uhc.so -lib/postgresql/utf8_and_win1250.so -lib/postgresql/utf8_and_win1256.so -lib/postgresql/utf8_and_win874.so -share/postgresql/cluster.conf.sample -share/postgresql/conversion_create.sql -share/postgresql/pg_hba.conf.sample -share/postgresql/pg_ident.conf.sample -share/postgresql/postgres.bki -share/postgresql/postgres.description -share/postgresql/postgresql.conf.sample -@dirrm include/libpq -@dirrm include/postgresql/internal/lib -@dirrm include/postgresql/internal/libpq -@dirrm include/postgresql/internal -@dirrm include/postgresql -@dirrm lib/postgresql -@dirrm share/postgresql -@dirrmtry pgsql |