Merged from senseidb/master

bin/load-index

@@ -42,7 +42,7 @@ def main(argv):
         "type"        : "exec",
         "mbean"       : "com.senseidb:zoie-name=pair-admin-%s-%s" % (self.node['id'], self.part),
         "operation"   : "loadIndex",
-        "arguments"   : [os.path.join(uri, str(self.part))]
+        "arguments"   : [os.path.join(uri, "shard" + str(self.part))]
       })
       if not res.get('value'):
         if res.get('status') == 404:

bin/start-sensei-node.sh

@@ -14,7 +14,15 @@ bin=`cd "$bin"; pwd`
 OS=`uname`
 IP="" # store IP
 case $OS in
-   Linux) IP=`/sbin/ifconfig  | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}' | head -n 1`;;
+   Linux) 
+        if [ -f /sbin/ifconfig ]
+        then
+            IP=`/sbin/ifconfig  | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}' | head -n 1`
+        else
+        # some linux use /bin/ifconfig (e.g. gentoo)
+            IP=`/bin/ifconfig | grep 'inet ' | grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $2}' | head -n 1`
+        fi
+        ;;
    FreeBSD|OpenBSD|Darwin) IP=`ifconfig | grep -E '^en[0-9]:' -A 4 | grep -E 'inet.[0-9]' | grep -v '127.0.0.1' | awk '{ print $2}' | head -n 1` ;;
    SunOS) IP=`ifconfig -a | grep inet | grep -v '127.0.0.1' | awk '{ print $2} ' | head -n 1` ;;
    *) IP="Unknown";;

example/cars/conf/schema.xml

@@ -29,7 +29,7 @@
 	     default delimiter is ","
 	 -->
 	<column name="tags" type="string" multi="true" delimiter=","/>
-	<!-- attributes: indexed,store,termvector are only used when type is text -->
+	<!-- attributes: indexed,termvector are only used when type is text -->
 	<column name="contents" type="text" index="ANALYZED" store="YES" termvector="YES" />
   </table>
 

resources/zookeeper.properties

@@ -2,3 +2,4 @@
 dataDir=/tmp/zookeeper
 # the port at which the clients will connect
 clientPort=2181
+maxClientCnxns=30