make peers verbose by default

diff --git a/xseg/launch b/xseg/launch
index 55c8cfe..2fae9b2 100755 (executable)
--- a/xseg/launch
+++ b/xseg/launch
@@ -108,19 +108,19 @@ function spawn_filed {
 
 function spawn_pfiled {
        "${XSEG_HOME}/peers/user/pfiled" -p "$BPORT" -g "${SPEC}" -n \
-       ${NR_OPS} "${PITHOS}" "${IMAGES}" &> "${XSEG_LOGS}/pfiled-${HOSTNAME}" &
+       ${NR_OPS} "${PITHOS}" "${IMAGES}" -v 1 &> "${XSEG_LOGS}/pfiled-${HOSTNAME}" &
 }
 
 function spawn_pfiledm {
        "${XSEG_HOME}/peers/user/pfiled" -p "$MBPORT" -g "${SPEC}" -n \
-       ${NR_OPS} "${PITHOSMAPS}" "${MAPS}"  &> "${XSEG_LOGS}/pfiledm-${HOSTNAME}" &
+       ${NR_OPS} "${PITHOSMAPS}" "${MAPS}" -v 1  &> "${XSEG_LOGS}/pfiledm-${HOSTNAME}" &
 }
 
 function spawn_vlmcd {
        pgrep -f "peers/user/st-vlmcd" || \
        "${XSEG_HOME}/peers/user/st-vlmcd" -t 1 -sp "$VPORT_START" \
        -ep "$VPORT_END" -bp "$BPORT" -mp "$MPORT" -g \
-       "${SPEC}" -n ${NR_OPS} -v 1 &> "${XSEG_LOGS}/vlmcd-${HOSTNAME}" &
+       "${SPEC}" -n ${NR_OPS} -v 3 &> "${XSEG_LOGS}/vlmcd-${HOSTNAME}" &
 #      alloc_requests "$VPORT:0" 128
 }
 
@@ -128,7 +128,7 @@ function spawn_mapperdc {
        pgrep -f "mt-mapperd" || \
        "${XSEG_HOME}/peers/user/mt-mapperd" -t 1 -sp "$MPORT" -ep "$MPORT"\
        -bp "$BPORT" -mbp "$MBPORT" -g "${SPEC}"\
-       -n ${NR_OPS} &> "${XSEG_LOGS}/mapperd-${HOSTNAME}" & 
+       -n ${NR_OPS} -v 3 &> "${XSEG_LOGS}/mapperd-${HOSTNAME}" & 
 #      alloc_requests "$MPORT:0" 128
 }
 

diff --git a/xseg/peers/kernel/xsegbd.c b/xseg/peers/kernel/xsegbd.c
index a0a8b26..596f133 100644 (file)
--- a/xseg/peers/kernel/xsegbd.c
+++ b/xseg/peers/kernel/xsegbd.c
@@ -26,7 +26,8 @@
 #define XSEGBD_MINORS 1
 /* define max request size to be used in xsegbd */
 //FIXME should we make this 4MB instead of 256KB ?
-#define XSEGBD_MAX_REQUEST_SIZE 262144U
+//#define XSEGBD_MAX_REQUEST_SIZE 262144U
+#define XSEGBD_MAX_REQUEST_SIZE 4194304U
 
 MODULE_DESCRIPTION("xsegbd");
 MODULE_AUTHOR("XSEG");
@@ -229,6 +230,7 @@ static int xsegbd_dev_init(struct xsegbd_device *xsegbd_dev)
 
        max_request_size_bytes = XSEGBD_MAX_REQUEST_SIZE;
        blk_queue_max_hw_sectors(xsegbd_dev->blk_queue, max_request_size_bytes >> 9);
+//     blk_queue_max_sectors(xsegbd_dev->blk_queue, max_request_size_bytes >> 10);
        blk_queue_max_segment_size(xsegbd_dev->blk_queue, max_request_size_bytes);
        blk_queue_io_min(xsegbd_dev->blk_queue, max_request_size_bytes);
        blk_queue_io_opt(xsegbd_dev->blk_queue, max_request_size_bytes);
@@ -843,6 +845,8 @@ out:
 }
 
 //FIXME
+//maybe try callback, first and then do a more invasive cleanup
+//DO NOT forget to put device!!
 static ssize_t xsegbd_cleanup(struct device *dev,
                                        struct device_attribute *attr,
                                        const char *buf,

diff --git a/xseg/xtypes/xlock.h b/xseg/xtypes/xlock.h
index 7c511af..3fd28df 100644 (file)
--- a/xseg/xtypes/xlock.h
+++ b/xseg/xtypes/xlock.h
@@ -82,12 +82,15 @@ static inline unsigned long xlock_try_lock(struct xlock *lock, unsigned long who
 static inline void xlock_release(struct xlock *lock)
 {
        BARRIER();
+       /*
 #ifdef XLOCK_SANITY_CHECKS
        if (lock->owner > MAX_VALID_OWNER){
                XSEGLOG("xlock %lx releasing lock with INVALID lock owner %lu",
                                (unsigned long) lock, lock->owner);
        }
-#endif /* XLOCK_SANITY_CHECKS */
+#endif 
+       */
+       /* XLOCK_SANITY_CHECKS */
        lock->owner = Noone;
 }