Merge remote-tracking branch 'refs/remotes/origin/master'

Author: 00k

.travis.yml

@@ -1,47 +1,6 @@
 language: cpp
 compiler: gcc
-env:
-    - PROTOBUF_VERSION=2.6.1
 install:
-    - sudo apt-get install libboost-dev
-
-    - wget https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz
-    - tar xf protobuf-2.6.1.tar.gz
-    - ( cd protobuf-$PROTOBUF_VERSION && ./configure && make -j4 && sudo make install && sudo ldconfig )
-
-    - git clone https://github.com/google/snappy
-    - ( cd snappy && sh ./autogen.sh && ./configure && make -j4 && sudo make install )
-
-    - git clone https://github.com/BaiduPS/sofa-pbrpc
-    - ( cd sofa-pbrpc && make -j4 && make install )
-
-    - wget http://www.us.apache.org/dist/zookeeper/stable/zookeeper-3.4.6.tar.gz
-    - tar zxvf zookeeper-3.4.6.tar.gz
-    - ( cd zookeeper-3.4.6/src/c && ./configure --disable-shared && make -j4 && sudo make install )
-
-    - git clone https://github.com/schuhschuh/gflags
-    - ( cd gflags && cmake -DGFLAGS_NAMESPACE=google && make -j4 && sudo make install )
-
-    - git clone https://github.com/google/glog
-    - ( cd glog && git checkout v0.3.3 && ./configure --disable-shared && make -j4 && sudo make install )
-    
-    - wget http://download.savannah.gnu.org/releases/libunwind/libunwind-0.99-beta.tar.gz
-    - tar zxvf libunwind-0.99-beta.tar.gz
-    - ( cd libunwind-0.99-beta && ./configure CFLAGS=-U_FORTIFY_SOURCE && make -j4 && sudo make install )
-
-    - wget https://googledrive.com/host/0B6NtGsLhIcf7MWxMMF9JdTN3UVk/gperftools-2.2.1.tar.gz
-    - tar zxvf gperftools-2.2.1.tar.gz
-    - ( cd gperftools-2.2.1 && ./configure && make -j4 && sudo make install )
-
-before_script:
-    - sed -i 's/^SOFA_PBRPC_PREFIX=.*/SOFA_PBRPC_PREFIX=.\/sofa-pbrpc\/output/' depends.mk
-    - sed -i 's/^PROTOBUF_PREFIX=.*/PROTOBUF_PREFIX=\/usr\/local/' depends.mk
-    - sed -i 's/^SNAPPY_PREFIX=.*/SNAPPY_PREFIX=\/usr\/local/' depends.mk
-    - sed -i 's/^ZOOKEEPER_PREFIX=.*/ZOOKEEPER_PREFIX=\/usr\/local/' depends.mk
-    - sed -i 's/^GFLAGS_PREFIX=.*/GFLAGS_PREFIX=\/usr\/local/' depends.mk
-    - sed -i 's/^GLOG_PREFIX=.*/GLOG_PREFIX=\/usr\/local/' depends.mk
-    - sed -i 's/^GPERFTOOLS_PREFIX=.*/GPERFTOOLS_PREFIX=\/usr\/local/' depends.mk
-    - sed -i 's/^BOOST_INCDIR=.*/BOOST_INCDIR=\/usr\/local\/include/' depends.mk
-
+    - sh -x build.sh
 script:
-    - make -j4
+    - echo "build done"

Makefile

@@ -14,7 +14,7 @@ INCPATH += -I./src -I./include -I./src/leveldb/include -I./src/leveldb $(DEPS_IN
 LDPATH += -L./src/leveldb $(DEPS_LDPATH)
 CFLAGS += $(OPT) $(INCPATH)
 CXXFLAGS += $(OPT) $(INCPATH)
-LDFLAGS += $(LDPATH) -lleveldb $(DEPS_LDFLAGS) -lpthread -lrt -lz -ldl
+LDFLAGS += $(LDPATH) -rdynamic -lleveldb $(DEPS_LDFLAGS) -lpthread -lrt -lz -ldl
 
 PROTO_FILES := $(wildcard src/proto/*.proto)
 PROTO_OUT_CC := $(PROTO_FILES:.proto=.pb.cc)

build.sh

@@ -17,13 +17,15 @@ mkdir -p ${DEPS_SOURCE} ${DEPS_PREFIX}
 cd ${DEPS_SOURCE}
 
 # boost
-wget http://softlayer-sng.dl.sourceforge.net/project/boost/boost/1.57.0/boost_1_57_0.tar.gz
+# wget http://softlayer-sng.dl.sourceforge.net/project/boost/boost/1.57.0/boost_1_57_0.tar.gz
+git clone --depth=1 https://github.com/00k/boost
+mv boost/boost_1_57_0.tar.gz .
 tar zxf boost_1_57_0.tar.gz
 rm -rf ${DEPS_PREFIX}/boost_1_57_0
 mv boost_1_57_0 ${DEPS_PREFIX}
 
 # protobuf
-#wget --no-check-certificate https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz
+# wget --no-check-certificate https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz
 git clone --depth=1 https://github.com/00k/protobuf
 mv protobuf/protobuf-2.6.1.tar.gz .
 tar zxf protobuf-2.6.1.tar.gz
@@ -34,7 +36,7 @@ make install
 cd -
 
 # snappy
-#wget --no-check-certificate https://snappy.googlecode.com/files/snappy-1.1.1.tar.gz
+# wget --no-check-certificate https://snappy.googlecode.com/files/snappy-1.1.1.tar.gz
 git clone --depth=1 https://github.com/00k/snappy
 mv snappy/snappy-1.1.1.tar.gz .
 tar zxf snappy-1.1.1.tar.gz
@@ -104,7 +106,7 @@ make install
 cd -
 
 # gperftools (tcmalloc)
-#wget --no-check-certificate https://googledrive.com/host/0B6NtGsLhIcf7MWxMMF9JdTN3UVk/gperftools-2.2.1.tar.gz
+# wget --no-check-certificate https://googledrive.com/host/0B6NtGsLhIcf7MWxMMF9JdTN3UVk/gperftools-2.2.1.tar.gz
 git clone --depth=1 https://github.com/00k/gperftools
 mv gperftools/gperftools-2.2.1.tar.gz .
 tar zxf gperftools-2.2.1.tar.gz

doc/cluster_setup.md

@@ -0,0 +1,56 @@
+Tera集群搭建
+============
+
+## 搭建要求
+
+### 系统要求
+* Linux系统集群，至少3个节点
+
+### 软件要求
+* zookeeper，推荐使用3.3或3.4的stable版本
+* HDFS，推荐使用1.2.1版本
+
+## 准备工作
+
+### zookeeper准备工作
+1. 搭建zookeeper
+  1. 请参考 http://zookeeper.apache.org/doc/r3.4.6/zookeeperStarted.html
+2. 配置zookeeper
+  1. 创建一个zk节点作为tera根节点，其下创建3个子节点：*master-lock，ts，kick*
+  2. 修改根节点和子节点的属性，对tera集群所有节点开放读写权限
+
+### hdfs准备工作
+1. 搭建hdfs
+  1. 请参考 https://hadoop.apache.org/docs/r1.2.1/index.html
+2. 配置hdfs
+  1. 创建一个hdfs目录作为tera的数据根目录
+  2. 修改目录属性，对tera集群所有节点开放读写权限
+
+### 搭建步骤
+1. 构建tera
+  * 请参考 BUILD文档
+2. 部署tera
+  * 在集群各节点创建tera根目录：*${tera_install}*，其下创建log、data两个子目录
+  * 将构建生成的build目录的bin、conf拷贝到${tera_install}下面
+3. 配置tera
+  * 用编辑器打开${tera_install}/conf/tera.flag，对下面四项配置进行修改：
+  ```
+  tera_tabletnode_path_prefix：hdfs上的tera数据目录，如*/user/tera/test/*
+  tera_tabletnode_cache_paths：ts的本地数据缓存目录，建议指向Flash/SSD硬盘，如*/home/ssd1;/home/ssd2*
+  tera_zk_addr_list：zookeeper节点ip:port列表，以逗号隔开，如*${host1}:2180,${host2}:2180*
+  tera_zk_root_path：zookeeper上的tera根节点，如/tera/test
+  ```
+  其它配置项一般不需要修改，如有需要，请参考src/tera_flag.cc
+4. 启动tera
+  * 在master节点上，执行以下命令
+  ```
+  cd ${tera_prefix}/bin
+  nohup ./tera_main --flagfile=../conf/tera.flag --tera_role=master &> ../log/master.stderr &
+  ```
+  * 在TabletServer节点上，执行以下命令
+  ```
+  cd ${tera_prefix}/bin
+  nohup ./tera_main --flagfile=../conf/tera.flag --tera_role=tabletserver &> ../log/tabletserver.stderr &
+  ```
+5. 停止tera
+  * 用kill命令杀掉tera_main对应的进程即可