[extrods] r248 committed - adding patches for endless loop and irsync bug

[codesite...@google.com]

Revision: 248
Author: vrowley.crbs2008
Date: Sat May 28 23:11:48 2011
Log: adding patches for endless loop and irsync bug
http://code.google.com/p/extrods/source/detail?r=248

Added:
/trunk/RPM/trunk/SOURCES/irods_2.5_patch_1
/trunk/RPM/trunk/SOURCES/irods_2.5_patch_2
Modified:
/trunk/RPM/trunk/SPECS/irods.spec

=======================================
--- /dev/null
+++ /trunk/RPM/trunk/SOURCES/irods_2.5_patch_1 Sat May 28 23:11:48 2011
@@ -0,0 +1,39 @@
+Author: mwan
+Date: Mon Mar 28 10:15:55 2011
+New Revision: 3871
+
+Log:
+Fix a problem where the child of the irodsServer could get into an infinite
+loop and use up large amount of CPU time because the request queue may be
+inconsistent because the parent is multi-threaded.
+
+Modified:
+ trunk/iRODS/server/core/src/rodsServer.c
+
+Modified: trunk/iRODS/server/core/src/rodsServer.c
+==============================================================================
+--- trunk/iRODS/server/core/src/rodsServer.c Thu Mar 24 06:51:54 2011
+(r3870)
++++ trunk/iRODS/server/core/src/rodsServer.c Mon Mar 28 10:15:55 2011
+(r3871)
+@@ -413,14 +413,20 @@
+ #endif
+ /* close any socket still in the queue */
+ #ifndef SINGLE_SVR_THR
++ /* These queues may be inconsistent because of the multi-threading
++ * of the parent. set sock to -1 if it has been closed */
+ tmpAgentProc = ConnReqHead;
+ while (tmpAgentProc != NULL) {
++ if (tmpAgentProc->sock == -1) break;
+ close (tmpAgentProc->sock);
++ tmpAgentProc->sock = -1;
+ tmpAgentProc = tmpAgentProc->next;
+ }
+ tmpAgentProc = SpawnReqHead;
+ while (tmpAgentProc != NULL) {
++ if (tmpAgentProc->sock == -1) break;
+ close (tmpAgentProc->sock);
++ tmpAgentProc->sock = -1;
+ tmpAgentProc = tmpAgentProc->next;
+ }
+ #endif
=======================================
--- /dev/null
+++ /trunk/RPM/trunk/SOURCES/irods_2.5_patch_2 Sat May 28 23:11:48 2011
@@ -0,0 +1,25 @@
+Author: mwan
+Date: Tue Mar 22 17:35:14 2011
+New Revision: 3866
+
+Log:
+Fix a problem in irsync where iRODS to iRODS (i:x i:y) sync does not work.
+
+Modified:
+ trunk/iRODS/clients/icommands/src/irsync.c
+
+Modified: trunk/iRODS/clients/icommands/src/irsync.c
+==============================================================================
+--- trunk/iRODS/clients/icommands/src/irsync.c Mon Mar 21 16:46:40 2011
+(r3865)
++++ trunk/iRODS/clients/icommands/src/irsync.c Tue Mar 22 17:35:14 2011
+(r3866)
+@@ -58,7 +58,7 @@
+ } else if (strncmp (argv[argc-i], "i:", 2) == 0) {
+ srcType = UNKNOWN_OBJ_T;
+ strcpy (buffer, argv[argc-i] + 2);
+- argv[argc-i] = buffer;
++ argv[argc-i] = strdup (buffer);
+ } else {
+ srcType = UNKNOWN_FILE_T;
+ }
=======================================
--- /trunk/RPM/trunk/SPECS/irods.spec Tue Oct 19 04:16:15 2010
+++ /trunk/RPM/trunk/SPECS/irods.spec Sat May 28 23:11:48 2011
@@ -15,8 +15,8 @@
Summary: IRODS - Integrated Rule-Oriented Data System
Name: irods
Group: System Environment/Daemons
-Version: 2.4.1
-Release: 1
+Version: 2.5
+Release: 2
License: BSD
Source0: irods%{version}.tgz
Source1: RPM-scripts.tar.gz
@@ -24,10 +24,10 @@
%if %{?_with_modules:1}0
Source3: modules.tar.gz
%endif
+
Patch0: iRODS-RPM.patch
Patch1: iRODS-postgres.patch
Patch2: enable-syslog.patch
-Patch7: RPMirodsctl.patch

%if %{?_with_ads:1}0
Patch3: ads-driver.patch
@@ -42,6 +42,10 @@
Patch6: clientMakefile.patch
%endif

+Patch7: RPMirodsctl.patch
+Patch8: irods_2.5_patch_1
+Patch9: irods_2.5_patch_2
+
URL: http://www.irods.org
Packager: Kev O'Neill - STFC
BuildRoot: /tmp/SRB-root
@@ -117,9 +121,9 @@
%if %{?_with_modules:1}0
%setup -T -D -a 3 -n iRODS
%endif
+
%patch0 -p0
%patch1 -p0
-%patch7 -p0

%if %{?_with_syslog:1}0
%patch2 -p0
@@ -139,6 +143,12 @@
%patch6 -p0
%endif

+%patch7 -p0
+echo "Patch #8:"
+patch -p2 -l -s < ../../SOURCES/irods_2.5_patch_1
+echo "Patch #9:"
+patch -p2 -l -s < ../../SOURCES/irods_2.5_patch_2
+
%build
#####################################################################