clickhouse配置文件更改

1. 去掉冷热数据配置

2 files changed, 84 insertions, 10 deletions

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4083680..d7019c0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="55c8c5b9-9b57-431e-a0ed-0064b85979fa" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/configurations/components.yml" beforeDir="false" afterPath="$PROJECT_DIR$/configurations/components.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/parcels/roles/components/clickhouse/common/templates/config.xml.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/components/clickhouse/common/templates/config.xml.j2" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -22,17 +22,50 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/configurations/components.yml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="787">
-              <caret line="175" column="42" lean-forward="true" selection-start-line="175" selection-start-column="42" selection-end-line="175" selection-end-column="42" />
+            <state relative-caret-position="412">
+              <caret line="146" column="26" selection-start-line="146" selection-start-column="26" selection-end-line="146" selection-end-column="26" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/parcels/roles/components/clickhouse/common/templates/config.xml.j2">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="570">
+              <caret line="379" column="24" lean-forward="true" selection-start-line="379" selection-start-column="24" selection-end-line="379" selection-end-column="24" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/parcels/roles/components/clickhouse/common/tasks/install_clickhouse.yml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="292">
+              <caret line="66" column="63" selection-start-line="66" selection-start-column="44" selection-end-line="66" selection-end-column="63" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/parcels/roles/components/clickhouse/data/tasks/install_clickhouse.yml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="578">
+              <caret line="40" column="57" selection-start-line="40" selection-start-column="57" selection-end-line="40" selection-end-column="57" />
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>clickhouse_ssd_path</find>
+      <find>pol</find>
+    </findStrings>
+  </component>
   <component name="Git.Settings">
     <option name="ROOT_SYNC" value="DONT_SYNC" />
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -43,6 +76,9 @@
         <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/configurations/config.yml" />
         <option value="$PROJECT_DIR$/configurations/components.yml" />
+        <option value="$PROJECT_DIR$/parcels/roles/components/clickhouse/common/tasks/install_clickhouse.yml" />
+        <option value="$PROJECT_DIR$/parcels/roles/components/clickhouse/data/tasks/install_clickhouse.yml" />
+        <option value="$PROJECT_DIR$/parcels/roles/components/clickhouse/common/templates/config.xml.j2" />
       </list>
     </option>
   </component>
@@ -110,7 +146,7 @@
       <workItem from="1629854869947" duration="503000" />
       <workItem from="1630466216768" duration="33000" />
       <workItem from="1630466362401" duration="1497000" />
-      <workItem from="1630476153920" duration="570000" />
+      <workItem from="1630476153920" duration="1245000" />
     </task>
     <task id="LOCAL-00001" summary="1. 新增自动检测安装ansible(本地yum源的方式实现)&#10;2. 抽取后的变量放回各自的roles中(因不想对客户暴露)&#10;3. clickhous初始化脚本关于bifang-maridb的部分变量化&#10;4. 修复一些小bug">
       <created>1629774644583</created>
@@ -133,11 +169,25 @@
       <option name="project" value="LOCAL" />
       <updated>1630476601335</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="配置文件更改&#10;1. clickhouse冷热数据分离配置, 抽取到components.yml中&#10;   #===========================Clickhouse===============================#&#10;   #ssd磁盘挂载的目录, 如果没有ssd磁盘可选择一块普通磁盘, 路径下面的'/'不可省略&#10;   clickhouse_ssd_path: /ssd_data/clickhouse/">
+      <created>1630476798212</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1630476798212</updated>
+    </task>
+    <task id="LOCAL-00005" summary="clickhouse配置文件更改&#10;1. 去掉冷热数据配置">
+      <created>1630481026679</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1630481026679</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="5122000" />
+    <option name="totallyTimeSpent" value="5797000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="2560" height="1440" extended-state="0" />
@@ -173,7 +223,8 @@
     <MESSAGE value="1. 新增自动检测安装ansible(本地yum源的方式实现)&#10;2. 抽取后的变量放回各自的roles中(因不想对客户暴露)&#10;3. clickhous初始化脚本关于bifang-maridb的部分变量化&#10;4. 修复一些小bug" />
     <MESSAGE value="1. 新增自动检测安装ansible(本地yum源的方式实现)&#10;2. storm替换flink(但是storm并未完全移除,可通过改变配置部署)&#10;3. 新增dos定时任务和dos数据流&#10;4. ck新增表, 服务镜像配置更新, druid新增任务/更新任务" />
     <MESSAGE value="配置文件更改&#10;1. clickhouse冷热数据分离配置, 抽取到components.yml中&#10;   #===========================Clickhouse===============================#&#10;   #ssd磁盘挂载的目录, 如果没有ssd磁盘可选择一块普通磁盘, 路径下面的'/'不可省略&#10;   clickhouse_ssd_path: /ssd_data/clickhouse/" />
-    <option name="LAST_COMMIT_MESSAGE" value="配置文件更改&#10;1. clickhouse冷热数据分离配置, 抽取到components.yml中&#10;   #===========================Clickhouse===============================#&#10;   #ssd磁盘挂载的目录, 如果没有ssd磁盘可选择一块普通磁盘, 路径下面的'/'不可省略&#10;   clickhouse_ssd_path: /ssd_data/clickhouse/" />
+    <MESSAGE value="clickhouse配置文件更改&#10;1. 去掉冷热数据配置" />
+    <option name="LAST_COMMIT_MESSAGE" value="clickhouse配置文件更改&#10;1. 去掉冷热数据配置" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/README.md" />
@@ -191,10 +242,31 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/parcels/roles/components/clickhouse/common/tasks/install_clickhouse.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="292">
+          <caret line="66" column="63" selection-start-line="66" selection-start-column="44" selection-end-line="66" selection-end-column="63" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/parcels/roles/components/clickhouse/data/tasks/install_clickhouse.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="40" column="57" selection-start-line="40" selection-start-column="57" selection-end-line="40" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/configurations/components.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="787">
-          <caret line="175" column="42" lean-forward="true" selection-start-line="175" selection-start-column="42" selection-end-line="175" selection-end-column="42" />
+        <state relative-caret-position="412">
+          <caret line="146" column="26" selection-start-line="146" selection-start-column="26" selection-end-line="146" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/parcels/roles/components/clickhouse/common/templates/config.xml.j2">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="570">
+          <caret line="379" column="24" lean-forward="true" selection-start-line="379" selection-start-column="24" selection-end-line="379" selection-end-column="24" />
         </state>
       </provider>
     </entry>
diff --git a/parcels/roles/components/clickhouse/common/templates/config.xml.j2 b/parcels/roles/components/clickhouse/common/templates/config.xml.j2
index 32e266f..eeaaeb5 100644
--- a/parcels/roles/components/clickhouse/common/templates/config.xml.j2
+++ b/parcels/roles/components/clickhouse/common/templates/config.xml.j2
@@ -368,6 +368,7 @@
       -->
     <format_schema_path>{{ install_path }}/clickhouse/format_schemas/</format_schema_path>
 
+    <!--
     <storage_configuration>
         <disks>
             <ssd>
@@ -389,6 +390,7 @@
             </ssd_to_hdd>
         </policies>
     </storage_configuration>
+    -->
 
     <!-- Uncomment to disable ClickHouse internal DNS caching. -->
     <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->