List:Commits« Previous MessageNext Message »
From:stewart Date:October 11 2007 8:45am
Subject:[patch 5/8] WL4081: add support for *storing* compressed LCP
View as plain text  
Index: telco-6.2/storage/ndb/src/kernel/blocks/backup/Backup.cpp
===================================================================
--- telco-6.2.orig/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2007-10-11
18:20:30.033953640 +1000
+++ telco-6.2/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2007-10-11
18:20:58.211335645 +1000
@@ -556,6 +556,7 @@ Backup::execDUMP_STATE_ORD(Signal* signa
   {
     /* Display a bunch of stuff about Backup defaults */
     infoEvent("Compressed Backup: %d", c_defaults.m_compressed_backup);
+    infoEvent("Compressed LCP: %d", c_defaults.m_compressed_lcp);
   }
 
   if(signal->theData[0] == DumpStateOrd::DumpBackupSetCompressed)
@@ -563,6 +564,12 @@ Backup::execDUMP_STATE_ORD(Signal* signa
     c_defaults.m_compressed_backup= signal->theData[1];
     infoEvent("Compressed Backup: %d", c_defaults.m_compressed_backup);
   }
+
+  if(signal->theData[0] == DumpStateOrd::DumpBackupSetCompressedLCP)
+  {
+    c_defaults.m_compressed_lcp= signal->theData[1];
+    infoEvent("Compressed LCP: %d", c_defaults.m_compressed_lcp);
+  }
 }
 
 bool
@@ -5139,6 +5146,10 @@ Backup::lcp_open_file(Signal* signal, Ba
     FsOpenReq::OM_CREATE | 
     FsOpenReq::OM_APPEND |
     FsOpenReq::OM_AUTOSYNC;
+
+  if (c_defaults.m_compressed_lcp)
+    req->fileFlags |= FsOpenReq::OM_GZ;
+
   if (c_defaults.m_o_direct)
     req->fileFlags |= FsOpenReq::OM_DIRECT;
   FsOpenReq::v2_setCount(req->fileNumber, 0xFFFFFFFF);
Index: telco-6.2/storage/ndb/include/mgmapi/mgmapi_config_parameters.h
===================================================================
--- telco-6.2.orig/storage/ndb/include/mgmapi/mgmapi_config_parameters.h	2007-10-11
18:20:47.494810035 +1000
+++ telco-6.2/storage/ndb/include/mgmapi/mgmapi_config_parameters.h	2007-10-11
18:21:10.635945029 +1000
@@ -125,6 +125,8 @@
 
 #define CFG_DB_COMPRESSED_BACKUP      172
 
+#define CFG_DB_COMPRESSED_LCP         173
+
 #define CFG_DB_SGA                    198 /* super pool mem */
 #define CFG_DB_DATA_MEM_2             199 /* used in special build in 5.1 */
 
Index: telco-6.2/storage/ndb/src/mgmsrv/ConfigInfo.cpp
===================================================================
--- telco-6.2.orig/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2007-10-11 18:20:30.397971494
+1000
+++ telco-6.2/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2007-10-11 18:20:58.335341727 +1000
@@ -1416,6 +1416,17 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "false",
     "false",
     "true"},
+  {
+    CFG_DB_COMPRESSED_LCP,
+    "CompressedLCP",
+    DB_TOKEN,
+    "Write compressed LCPs using zlib",
+    ConfigInfo::CI_USED,
+    true,
+    ConfigInfo::CI_BOOL,
+    "false",
+    "false",
+    "true"},
 
   /***************************************************************************
    * API
Index: telco-6.2/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
===================================================================
--- telco-6.2.orig/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp	2007-10-11
18:20:30.533978164 +1000
+++ telco-6.2/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp	2007-10-11
18:20:58.483348986 +1000
@@ -158,7 +158,8 @@ public:
     DumpLgman = 10000,
     DumpPgman = 11000,
     DumpBackup = 13000,
-    DumpBackupSetCompressed = 13001
+    DumpBackupSetCompressed = 13001,
+    DumpBackupSetCompressedLCP = 13002
   };
 public:
   
Index: telco-6.2/storage/ndb/src/kernel/blocks/backup/Backup.hpp
===================================================================
--- telco-6.2.orig/storage/ndb/src/kernel/blocks/backup/Backup.hpp	2007-10-11
18:20:30.289966196 +1000
+++ telco-6.2/storage/ndb/src/kernel/blocks/backup/Backup.hpp	2007-10-11
18:20:58.519350752 +1000
@@ -552,6 +552,7 @@ public:
     Uint32 m_diskless;
     Uint32 m_o_direct;
     Uint32   m_compressed_backup;
+    Uint32 m_compressed_lcp;
   };
   
   /**
Index: telco-6.2/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
===================================================================
--- telco-6.2.orig/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp	2007-10-11
18:20:30.477975418 +1000
+++ telco-6.2/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp	2007-10-11
18:20:58.559352714 +1000
@@ -163,6 +163,8 @@ Backup::execREAD_CONFIG_REQ(Signal* sign
 			    &c_defaults.m_disk_synch_size);
   ndb_mgm_get_int_parameter(p, CFG_DB_COMPRESSED_BACKUP,
 			    &c_defaults.m_compressed_backup);
+  ndb_mgm_get_int_parameter(p, CFG_DB_COMPRESSED_LCP,
+			    &c_defaults.m_compressed_lcp);
 
   m_backup_report_frequency = 0;
   ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_REPORT_FREQUENCY, 

--
Stewart Smith
Thread
[patch 0/8] WL4081 NDB Compressed LCP and Backupstewart11 Oct
  • [patch 4/8] WL4081: read compressed backup filesstewart11 Oct
  • [patch 3/8] WL4081: Add compressed file support to AsyncFile (azio) and support compressed backups.stewart11 Oct
  • [patch 1/8] WL4081: Copy azio for NDBstewart11 Oct
  • [patch 6/8] WL4081: Add support to AsyncFile for reading zlib compressed files.stewart11 Oct
  • [patch 5/8] WL4081: add support for *storing* compressed LCPstewart11 Oct
  • [patch 8/8] WL4081 Futz with mtr ndb config to enable compressed lcp, backup and O_DIRECTstewart11 Oct
  • [patch 7/8] WL4081 Allow use of direct IO (O_DIRECT) with aziostewart11 Oct
  • [patch 2/8] WL4081: Make azio build for NDBstewart11 Oct
  • Re: [patch 0/8] WL4081 NDB Compressed LCP and BackupStewart Smith11 Oct