[1941] in Moira Commits
/svn/moira r4080 - trunk/moira/gen
daemon@ATHENA.MIT.EDU (Jonathon Weiss)
Wed May 30 12:30:25 2012
Date: Wed, 30 May 2012 12:30:24 -0400
From: Jonathon Weiss <jweiss@MIT.EDU>
Message-Id: <201205301630.q4UGUOEJ028524@drugstore.mit.edu>
To: moira-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jweiss
Date: 2012-05-30 12:30:24 -0400 (Wed, 30 May 2012)
New Revision: 4080
Modified:
trunk/moira/gen/hesiod.pc
Log:
supress hesiod filesys entries for filesystems with a lockertype of "site".
Modified: trunk/moira/gen/hesiod.pc
===================================================================
--- trunk/moira/gen/hesiod.pc 2012-05-23 22:42:25 UTC (rev 4079)
+++ trunk/moira/gen/hesiod.pc 2012-05-30 16:30:24 UTC (rev 4080)
@@ -497,7 +497,7 @@
char name[FILESYS_LABEL_SIZE], type[FILESYS_TYPE_SIZE];
char loc[FILESYS_NAME_SIZE], access[FILESYS_RWACCESS_SIZE];
char mount[FILESYS_MOUNT_SIZE], comments[FILESYS_COMMENTS_SIZE];
- char key[FSGROUP_KEY_SIZE];
+ char key[FSGROUP_KEY_SIZE], ltype[FILESYS_LOCKERTYPE_SIZE];
char aname[ALIAS_NAME_SIZE], trans[ALIAS_TRANS_SIZE];
int flag, id, fid;
EXEC SQL END DECLARE SECTION;
@@ -518,19 +518,23 @@
sq2 = sq_create();
EXEC SQL DECLARE f_cursor CURSOR FOR
- SELECT label, type, name, mach_id, rwaccess, mount, comments, filsys_id
+ SELECT label, type, name, mach_id, rwaccess, mount, comments, filsys_id,
+ lockertype
FROM filesys
ORDER BY filsys_id;
EXEC SQL OPEN f_cursor;
while (1)
{
EXEC SQL FETCH f_cursor INTO :name, :type, :loc, :id, :access,
- :mount, :comments, :fid;
+ :mount, :comments, :fid, :ltype;
if (sqlca.sqlcode)
break;
strtrim(name);
if (!valid(name))
continue;
+ strtrim(ltype);
+ if (!strcmp(ltype, "SITE"))
+ continue;
strtrim(type);
if (!strcmp(type, "NFS") || !strcmp(type, "RVD"))
{
