From d1d628021069aab6fa63118db51fe23ecdfec3d8 Mon Sep 17 00:00:00 2001 From: Russell Sears Date: Mon, 2 Apr 2012 10:13:39 -0700 Subject: [PATCH] update readme for github, remove y/ directory --- y/Makefile.y | 38 ---------------------------- y/Makefile2.y | 26 ------------------- y/cmds.txt | 9 ------- y/conf/dht_lsm_server.ini | 10 -------- y/install.sh | 15 ----------- y/packages/Makefile | 12 --------- y/packages/dht_lsm_server.run | 9 ------- y/packages/dht_lsm_server.yicf | 42 ------------------------------- y/packages/dht_lsm_server_log.run | 2 -- 9 files changed, 163 deletions(-) delete mode 100644 y/Makefile.y delete mode 100644 y/Makefile2.y delete mode 100644 y/cmds.txt delete mode 100644 y/conf/dht_lsm_server.ini delete mode 100755 y/install.sh delete mode 100644 y/packages/Makefile delete mode 100755 y/packages/dht_lsm_server.run delete mode 100644 y/packages/dht_lsm_server.yicf delete mode 100755 y/packages/dht_lsm_server_log.run diff --git a/y/Makefile.y b/y/Makefile.y deleted file mode 100644 index b38f328..0000000 --- a/y/Makefile.y +++ /dev/null @@ -1,38 +0,0 @@ -ROOT=/home/y -include $(ROOT)/share/yahoo_cfg/Make.defs - -USE_OSE = no - -LIB_NAME = LSMServer -SHLIB_VERSION = 1 - -CXXSRC = LSMServerHandler.cc - -LCLEAN += *~ -WARN += -Werror -Wall -LINC += -I. -I /usr/local/include/thrift -I /home/y/include64/stasis -I .. -I ../../thrift/gen-cpp - -LDLIBS += -L/usr/local/lib -LDFLAGS += -Wl,-rpath,/home/y/lib64 -Wl,-rpath,../build - - -# Poor packaging for yicu -LINC += -I/home/y/include/yicu - -LDLIBS += -lthrift -lmapkeeper -lstasis -llogstore -L ../build -L ../../thrift/gen-cpp - -# Need to remove potential warnings in yapache. -LDEF += -DEAPI -LDEF += -D_FILE_OFFSET_BITS=64 - -ifdef UNIT_TEST -CXXFLAGS += -O0 -g -DUNIT_TEST -endif - -ifdef DEBUG -CXXFLAGS += -O0 -g -endif - -include $(ROOT)/share/yahoo_cfg/Make.rules - -$(SOTARGET): $(OBJS) diff --git a/y/Makefile2.y b/y/Makefile2.y deleted file mode 100644 index f74727b..0000000 --- a/y/Makefile2.y +++ /dev/null @@ -1,26 +0,0 @@ -include /home/y/share/yahoo_cfg/Make.defs - -USE_OSE = no - -EXETARGET = lsm_server lsm_client - -CXXSRC = $(addsuffix .cc, $(EXETARGET)) - -LCLEAN += *~ -WARN += -Werror -Wall - -LINC += -I../ -I /usr/local/include/thrift -I /home/y/include/boost/tr1/ -I ../../ -I ../../../thrift/gen-cpp/ -LDLIBS += -L../ -lmapkeeper -lLSMServer -L ../../../thrift/gen-cpp -LDFLAGS += -Wl,-rpath,/home/y/lib64 -Wl,-rpath,../../build - -ifdef UNIT_TEST -CXXFLAGS += -O0 -g -DUNIT_TEST -endif - -ifdef DEBUG -CXXFLAGS += -O0 -g -endif - -include /home/y/share/yahoo_cfg/Make.rules - -$(EXETARGET): $(addsuffix .o, $@) diff --git a/y/cmds.txt b/y/cmds.txt deleted file mode 100644 index 5b24608..0000000 --- a/y/cmds.txt +++ /dev/null @@ -1,9 +0,0 @@ - dd if=/dev/zero of=storefile.txt bs=1M count=20000 - - -/dhtRecOpsGenerator -d clientType=LogStoreClient host=sherpa4 numOps=10ls existingStartKey=100 existingEndKey=1000 insertRatio=1.0 - - - - -dhtRecOpsGeneratorWrapper startClientID=1 endClientID=4 -d clientType=LogStoreClient host=sherpa4.corp.re1.yahoo.com numOps=5000000 existingStartKey=100 existingEndKey=10000000 insertRatio=1.0 readRatio=0 numClients=3 diff --git a/y/conf/dht_lsm_server.ini b/y/conf/dht_lsm_server.ini deleted file mode 100644 index f3f2b9c..0000000 --- a/y/conf/dht_lsm_server.ini +++ /dev/null @@ -1,10 +0,0 @@ -env_dir=/home/y/var/dht_bdb_server/data -port=9090 -num_threads=$(num_threads) -num_partitions=$(num_partitions) -num_retries=100 -key_buffer_size_bytes=2048 -value_buffer_size_bytes=1150976 - -checkpoint_frequency_msec=1000 -checkpoint_min_change_kb=10 diff --git a/y/install.sh b/y/install.sh deleted file mode 100755 index 673a6fa..0000000 --- a/y/install.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -mkdir -p ~/stuff/lib/ -mkdir -p ~/stuff/include/ - -cp build/liblogstore_client.so ~/stuff/lib/ -cp network.h datatuple.h tcpclient.h ~/stuff/include/ -cp sherpa/LSMPersistentStoreImpl.cc sherpa/LSMPersistentStoreImpl.h ~/stuff/sherpa_logstore/ - - -echo ' in the yroot, do this: ' - -echo ' pushd /usr/local/include ; sudo ln -s /home/sears/stuff/include/*.h . ; popd ' -echo ' pushd /usr/local/lib ; sudo ln -s /home/sears/stuff/lib/*.so . ; popd ' -echo ' pushd ~/svndev/trunk/dht/storage/handler/src/ ; ln -s ~/stuff/sherpa_logstore/* . ; popd ' - diff --git a/y/packages/Makefile b/y/packages/Makefile deleted file mode 100644 index 593000b..0000000 --- a/y/packages/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -ROOT=/home/y -include $(ROOT)/share/yahoo_cfg/Make.defs - -# Just to pick up "clean" and "package" rules - -all:: package-release - -test:: package-test - -clean:: package-clean - -include $(ROOT)/share/yahoo_cfg/Make.rules diff --git a/y/packages/dht_lsm_server.run b/y/packages/dht_lsm_server.run deleted file mode 100755 index 5869737..0000000 --- a/y/packages/dht_lsm_server.run +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# -# This is the 'run' script used by daemontools to start dht_lsm_server. -# See the dist page for more details about daemontools. -# -# http://dist.corp.yahoo.com/by-package/daemontools_y/ -# -cd /home/y/var/dht_lsm_server/data -exec /home/y/bin/setuidgid nobody /home/y/bin64/lsm_server --benchmark --log-mode 1 2>&1 diff --git a/y/packages/dht_lsm_server.yicf b/y/packages/dht_lsm_server.yicf deleted file mode 100644 index 6bdab36..0000000 --- a/y/packages/dht_lsm_server.yicf +++ /dev/null @@ -1,42 +0,0 @@ -PRODUCT_NAME = dht_lsm_server -VERSION=1.0.0 -SHORT_DESC = LSM-Tree -LONG_DESC = LSM-Tree persistent store for sherpa -CUSTODIAN = ydht-devel@yahoo-inc.com http://twiki.corp.yahoo.com/view/YDHT - -OWNER = root -GROUP = wheel -PERM = 0444 - -YINST bug-product dht -YINST bug-component General - -YINST requires pkg daemontools_y ROOT ROOT_MAX -YINST requires pkg dht_persistent_store64 ROOT ROOT_MAX - -dir 0777 - - logs/dht_lsm_server -dir 0755 - - var/daemontools/dht_lsm_server -dir 0755 - - var/daemontools/dht_lsm_server/log -dir 0777 - - conf/dht_lsm_server -dir 0777 - - var/dht_lsm_server/data - -file 0555 - - bin64/ ../sherpa/main/lsm_server - -file 0444 - - lib64/liblogstore.so.1 ../build/liblogstore.so -symlink 0444 - - lib64/liblogstore.so liblogstore.so.1 - -file 0444 - - lib64/ ../sherpa/libLSMServer.so.1 -symlink 0444 - - lib64/libLSMServer.so libLSMServer.so.1 - -file 0555 - - var/daemontools/dht_lsm_server/run dht_lsm_server.run -file 0555 - - var/daemontools/dht_lsm_server/log/run dht_lsm_server_log.run - -configfile 0644 - - conf/dht_lsm_server/dht_lsm_server.ini ../conf/dht_lsm_server.ini expand overwrite - -YINST set log_level INFO -YINST set cache_size_gb 4 -YINST set num_partitions 32 -YINST set num_threads 32 -YINST start 30 $ROOT/bin/svcstart dht_lsm_server -YINST stop 30 $ROOT/bin/svcstop dht_lsm_server -YINST pre-deactivate $ROOT/bin/svcstop dht_lsm_server diff --git a/y/packages/dht_lsm_server_log.run b/y/packages/dht_lsm_server_log.run deleted file mode 100755 index c19233d..0000000 --- a/y/packages/dht_lsm_server_log.run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /home/y/bin/setuidgid nobody /usr/sbin/cronolog -l /home/y/logs/dht_lsm_server/stdout.log "/home/y/logs/dht_lsm_server/stdout.log.%Y%m%d"