Bug#33772598 Make block fill in OM_ENCRYPT_KEY for TS and UNDO

Change-Id: Iccbd00574372636e0ec6759179ffae89cb6915b4

Author: zmur

storage/ndb/src/kernel/blocks/lgman.cpp

@@ -1628,6 +1628,16 @@ Lgman::open_file(Signal* signal,
   req->file_size_lo = (Uint32)(size & 0xFFFFFFFF);
   req->auto_sync_size = 0;
 
+  if ((req->fileFlags & FsOpenReq::OM_ENCRYPT_CIPHER_MASK) != 0)
+  {
+    ndbrequire(handle->m_cnt == 1);
+    ndbrequire(import(handle->m_ptr[FsOpenReq::ENCRYPT_KEY_MATERIAL],
+                      (const Uint32*)&FsOpenReq::DUMMY_KEY,
+                      FsOpenReq::DUMMY_KEY.get_needed_words()));
+    handle->m_cnt++;
+    req->fileFlags |= FsOpenReq::OM_ENCRYPT_KEY;
+  }
+
   sendSignal(NDBFS_REF, GSN_FSOPENREQ, signal, FsOpenReq::SignalLength, JBB,
 	     handle);
 }

storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp

@@ -667,7 +667,7 @@ Ndbfs::execFSOPENREQ(Signal* signal)
        FsOpenReq::v4_getBasePath(fsOpenReq->fileNumber) == FsOpenReq::BP_DD_DF)
     { /* TS data files */
       require((fsOpenReq->fileFlags & FsOpenReq::OM_ENCRYPT_XTS));
-      require(!(fsOpenReq->fileFlags & FsOpenReq::OM_ENCRYPT_KEY));
+      require((fsOpenReq->fileFlags & FsOpenReq::OM_ENCRYPT_KEY));
       if (page_size == 0) fprintf(stderr,"YYY: %s: %u: %s: page_size %zu\n",__func__,__LINE__,file->theFileName.c_str(),(size_t)page_size);
       require(page_size > 0);
     }
@@ -676,7 +676,7 @@ Ndbfs::execFSOPENREQ(Signal* signal)
         FsOpenReq::v4_getBasePath(fsOpenReq->fileNumber) == FsOpenReq::BP_DD_UF)
     { /* LG undo files */
       require((fsOpenReq->fileFlags & FsOpenReq::OM_ENCRYPT_XTS));
-      require(!(fsOpenReq->fileFlags & FsOpenReq::OM_ENCRYPT_KEY));
+      require((fsOpenReq->fileFlags & FsOpenReq::OM_ENCRYPT_KEY));
       if (page_size == 0) fprintf(stderr,"YYY: %s: %u: %s: page_size %zu\n",__func__,__LINE__,file->theFileName.c_str(),(size_t)page_size);
       require(page_size > 0);
     }

storage/ndb/src/kernel/blocks/tsman.cpp

@@ -1077,6 +1077,15 @@ Tsman::open_file(Signal* signal,
       extent_pages);
 #endif
 
+  if ((req->fileFlags & FsOpenReq::OM_ENCRYPT_CIPHER_MASK) != 0)
+  {
+    ndbrequire(handle->m_cnt == 1);
+    ndbrequire(import(handle->m_ptr[FsOpenReq::ENCRYPT_KEY_MATERIAL],
+                      (const Uint32*)&FsOpenReq::DUMMY_KEY,
+                      FsOpenReq::DUMMY_KEY.get_needed_words()));
+    handle->m_cnt++;
+    req->fileFlags |= FsOpenReq::OM_ENCRYPT_KEY;
+  }
   sendSignal(NDBFS_REF, GSN_FSOPENREQ, signal, FsOpenReq::SignalLength, JBB,
 	     handle);