change default db path

Former-commit-id: e3d73ebff47c9048379fb7db9adf0a0a4695fed7

cpp/CMakeLists.txt

@@ -136,17 +136,15 @@ if (BUILD_COVERAGE STREQUAL "ON")
 endif()
 
 
-if (BUILD_UNIT_TEST)
+if ("${BUILD_UNIT_TEST}" STREQUAL "ON")
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/unittest)
 endif(BUILD_UNIT_TEST)
 
 add_custom_target(Clean-All COMMAND ${CMAKE_BUILD_TOOL} clean)
 
 
-if("${MILVUS_DB_PATHE}" STREQUAL "")
-    set(MILVUS_PATH "/tmp/milvus")
-else()
-    set(MILVUS_PATH ${MILVUS_DB_PATHE})
+if("${MILVUS_DB_PATH}" STREQUAL "")
+    set(MILVUS_DB_PATH "/tmp/milvus")
 endif()
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/conf/server_config.template ${CMAKE_CURRENT_SOURCE_DIR}/conf/server_config.yaml)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/conf/log_config.template ${CMAKE_CURRENT_SOURCE_DIR}/conf/log_config.conf)

cpp/build.sh

 #!/bin/bash
 
 BUILD_TYPE="Debug"
-BUILD_UNITTEST="off"
+BUILD_UNITTEST="OFF"
 LICENSE_CHECK="OFF"
 INSTALL_PREFIX=$(pwd)/milvus
 MAKE_CLEAN="OFF"
 BUILD_COVERAGE="OFF"
 DB_PATH="/opt/milvus"
 
-while getopts "p:t:uhlrc" arg
+while getopts "p:d:t:uhlrc" arg
 do
         case $arg in
              t)
@@ -16,11 +16,14 @@ do
                 ;;
              u)
                 echo "Build and run unittest cases" ;
-                BUILD_UNITTEST="on";
+                BUILD_UNITTEST="ON";
                 ;;
              p)
                 INSTALL_PREFIX=$OPTARG
                 ;;
+             d)
+                DB_PATH=$OPTARG
+                ;;
              l)
                 LICENSE_CHECK="ON"
                 ;;
@@ -37,12 +40,13 @@ do
                 echo "
 
 parameter:
--t: build type
--u: building unit test options
--p: install prefix
--l: build license version
--r: remove previous build directory
--c: code coverage
+-t: build type(default: Debug)
+-u: building unit test options(default: OFF)
+-p: install prefix(default: $(pwd)/milvus)
+-d: db path(default: /opt/milvus)
+-l: build license version(default: OFF)
+-r: remove previous build directory(default: OFF)
+-c: code coverage(default: OFF)
 
 usage:
 ./build.sh -t \${BUILD_TYPE} [-u] [-h] [-g] [-r] [-c]
@@ -72,7 +76,7 @@ if [[ ${MAKE_CLEAN} == "ON" ]]; then
     -DCMAKE_CUDA_COMPILER=${CUDA_COMPILER} \
     -DCMAKE_LICENSE_CHECK=${LICENSE_CHECK} \
     -DBUILD_COVERAGE=${BUILD_COVERAGE} \
-    -DMILVUS_DB_PATHE=${DB_PATH} \
+    -DMILVUS_DB_PATH=${DB_PATH} \
     $@ ../"
     echo ${CMAKE_CMD}
 

cpp/conf/log_config.template

 * GLOBAL:
     FORMAT                  =   "%datetime | %level | %logger | %msg"
-    FILENAME                =   "@MILVUS_PATH@/logs/milvus-%datetime{%H:%m}-global.log"
+    FILENAME                =   "@MILVUS_DB_PATH@/logs/milvus-%datetime{%H:%m}-global.log"
     ENABLED                 =   true
     TO_FILE                 =   true
     TO_STANDARD_OUTPUT      =   false
@@ -8,12 +8,12 @@
     PERFORMANCE_TRACKING    =   false
     MAX_LOG_FILE_SIZE       =   2097152 ## Throw log files away after 2MB
 * DEBUG:
-    FILENAME                =   "@MILVUS_PATH@/logs/milvus-%datetime{%H:%m}-debug.log"
+    FILENAME                =   "@MILVUS_DB_PATH@/logs/milvus-%datetime{%H:%m}-debug.log"
     ENABLED                 =   true
 * WARNING:
-    FILENAME                =   "@MILVUS_PATH@/logs/milvus-%datetime{%H:%m}-warning.log"
+    FILENAME                =   "@MILVUS_DB_PATH@/logs/milvus-%datetime{%H:%m}-warning.log"
 * TRACE:
-    FILENAME                =   "@MILVUS_PATH@/logs/milvus-%datetime{%H:%m}-trace.log"
+    FILENAME                =   "@MILVUS_DB_PATH@/logs/milvus-%datetime{%H:%m}-trace.log"
 * VERBOSE:
     FORMAT                  =   "%datetime{%d/%M/%y} | %level-%vlevel | %msg"
     TO_FILE                 =   false
@@ -21,7 +21,7 @@
 ## Error logs
 * ERROR:
     ENABLED                 =   true
-    FILENAME                =   "@MILVUS_PATH@/logs/milvus-%datetime{%H:%m}-error.log"
+    FILENAME                =   "@MILVUS_DB_PATH@/logs/milvus-%datetime{%H:%m}-error.log"
 * FATAL:
     ENABLED                 =   true
-    FILENAME                =   "@MILVUS_PATH@/logs/milvus-%datetime{%H:%m}-fatal.log"
\ No newline at end of file
+    FILENAME                =   "@MILVUS_DB_PATH@/logs/milvus-%datetime{%H:%m}-fatal.log"
\ No newline at end of file

cpp/conf/server_config.template

@@ -5,7 +5,7 @@ server_config:
   mode: single                # milvus deployment type: single, cluster
 
 db_config:
-  db_path: @MILVUS_PATH@             # milvus data storage path
+  db_path: @MILVUS_DB_PATH@             # milvus data storage path
   db_backend_url: http://127.0.0.1 # meta database uri
   index_building_threshold: 1024   # index building trigger threshold, default: 1024, unit: MB
   archive_disk_threshold: 512      # triger archive action if storage size exceed this value, unit: GB
@@ -22,7 +22,7 @@ metric_config:
 
 
 license_config:         # license configure
-  license_path: "@MILVUS_PATH@/system.license" # license file path
+  license_path: "@MILVUS_DB_PATH@/system.license" # license file path
 
 cache_config:           # cache configure
   cpu_cache_capacity: 16   # how many memory are used as cache, unit: GB, range: 0 ~ less than total memory
\ No newline at end of file