-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathcentralized_commit_changes
2662 lines (2484 loc) · 98.7 KB
/
centralized_commit_changes
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/hadoop-1.2.1/src/core/org/apache/hadoop/io/SetWritable.java b/hadoop-1.2.1/src/core/org/apache/hadoop/io/SetWritable.java
new file mode 100644
index 0000000..929bcf1
--- /dev/null
+++ b/hadoop-1.2.1/src/core/org/apache/hadoop/io/SetWritable.java
@@ -0,0 +1,97 @@
+package org.apache.hadoop.io;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.hadoop.io.WritableComparable;
+
+import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.io.WritableFactories;
+import org.apache.hadoop.io.WritableFactory;
+
+/**
+ *
+ * @author amar
+ */
+public class SetWritable implements Writable {
+
+ static { // register a ctor
+ WritableFactories.setFactory
+ (SetWritable.class,
+ new WritableFactory() {
+ public Writable newInstance() { return new SetWritable(); }
+ });
+ }
+
+ private Set<Integer> itemSet;
+
+ /**
+ * Constructor.
+ */
+ public SetWritable() {
+
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param itemSet
+ */
+ public SetWritable(Set<Integer> itemSet) {
+
+ this.itemSet = itemSet;
+ }
+
+ public String toString() {
+
+ return itemSet.toString();
+ }
+
+ public int size() {
+
+ return itemSet.size();
+ }
+
+ public void readFields(DataInput in) throws IOException {
+
+ // First clear the set. Otherwise we will just accumulate
+ // entries every time this method is called.
+ if (this.itemSet != null) {
+ this.itemSet.clear();
+ } else {
+ this.itemSet = new HashSet<Integer>();
+ }
+ int count = in.readInt();
+ while (count-- > 0) {
+ itemSet.add(in.readInt());
+ }
+ }
+
+ public void write(DataOutput out) throws IOException {
+
+ out.writeInt(itemSet.size());
+ for (int item : itemSet) {
+ out.writeInt(item);
+ }
+ }
+
+
+
+ /**
+ * Gets the itemSet.
+ *
+ * @return itemSet.
+ */
+ public Set<Integer> getItemSet() {
+
+ return itemSet;
+ }
+
+ public void setItemSet(Set<Integer> itemSet) {
+
+ this.itemSet = itemSet;
+ }
+}
diff --git a/hadoop-1.2.1/src/examples/org/apache/hadoop/examples/WordCount.java b/hadoop-1.2.1/src/examples/org/apache/hadoop/examples/WordCount.java
index 0860305..9436607 100644
--- a/hadoop-1.2.1/src/examples/org/apache/hadoop/examples/WordCount.java
+++ b/hadoop-1.2.1/src/examples/org/apache/hadoop/examples/WordCount.java
@@ -66,10 +66,10 @@ public class WordCount {
public static void main(String[] args) throws Exception {
Configuration conf = new Configuration();
String[] otherArgs = new GenericOptionsParser(conf, args).getRemainingArgs();
- if (otherArgs.length != 2) {
- System.err.println("Usage: wordcount <in> <out>");
- System.exit(2);
- }
+ //if (otherArgs.length != 2) {
+ // System.err.println("Usage: wordcount <in> <out>");
+ // System.exit(2);
+ //}
Job job = new Job(conf, "word count");
job.setJarByClass(WordCount.class);
job.setMapperClass(TokenizerMapper.class);
diff --git a/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/aodv/Node.java b/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/aodv/Node.java
index a33bbb2..f6411c4 100644
--- a/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/aodv/Node.java
+++ b/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/aodv/Node.java
@@ -263,6 +263,7 @@ public class Node extends Observable {
* @param data the actual data which the application message contained
*/
protected void notifyAboutDataReceived(int senderNodeAddess, UserDataPacket packet) {
+ //System.out.print("Received data type "+packet.getData().getPacketType()+" from Node "+senderNodeAddess);
messagesForObservers.add(new AODVDataToObserver(ObserverConst.AODV_DATA_CONTAINER, packet.getData()));
wakeNotifierThread();
}
@@ -275,7 +276,7 @@ public class Node extends Observable {
*/
protected void notifyAboutDataReceived(int senderNodeAddess, AODVDataContainer data) {
messagesForObservers.add(new AODVDataToObserver(ObserverConst.AODV_DATA_CONTAINER, data));
- Logger.i(TAG, "Packet type " + data.getPacketType() + " is added to messagesForObservers");
+ //Logger.i(TAG, "Packet type " + data.getPacketType() + " is added to messagesForObservers");
wakeNotifierThread();
}
@@ -456,8 +457,9 @@ public class Node extends Observable {
}
}
setChanged();
- notifyObservers(messagesForObservers.poll());
- Logger.i(TAG, "Packet is sent to Observer");
+ MessageToObserver tmp=messagesForObservers.poll();
+ notifyObservers(tmp);
+ //Logger.i(TAG, "Packet is sent to Observer" + tmp.getMessageType());
}catch (InterruptedException e) {
// thread stopped
}
diff --git a/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/aodv/Receiver.java b/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/aodv/Receiver.java
index 8dfb9e0..7cb8ce7 100644
--- a/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/aodv/Receiver.java
+++ b/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/aodv/Receiver.java
@@ -90,7 +90,7 @@ public class Receiver implements Runnable {
str.append(msg.getType() + ", " + nodeAddress + ", " + msg.getSender());
str.append("\n");
//dataLogger.appendSensorData(LogFileName.PACKET_RECEIVED, str.toString());
-
+ //System.out.println(" MEssage Recieved in Receiver "+str);
switch (msg.getType()) {
case Constants.HELLO_PDU:
HelloPacket hello = HelloPacket.parseFromByteArray(msg.data, HelloPacket.class);
diff --git a/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/aodv/Sender.java b/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/aodv/Sender.java
index baab90c..9c00087 100644
--- a/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/aodv/Sender.java
+++ b/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/aodv/Sender.java
@@ -57,7 +57,7 @@ public class Sender implements Runnable{
public void startThread(){
keepRunning = true;
- startHelloBroadcast();
+ //startHelloBroadcast();
senderThread = new Thread(this, Sender.class.getSimpleName());
senderThread.start();
}
@@ -96,7 +96,8 @@ public class Sender implements Runnable{
str.append("userdata, " + userData.getUserDataType() + ", ");
str.append(parent.getNodeId() + ", " + userData.getDestinationAddress() + ", ");
str.append(userData.getHopCount());
- str.append("\n");
+ str.append("\n\n\n\n");
+ //System.out.println(" UserData Packet "+str);
//dataLogger.appendSensorData(LogFileName.PACKET_SENT, str.toString());
try{
@@ -446,7 +447,7 @@ public class Sender implements Runnable{
protected void queueUserMessageFromNode(UserDataPacket userPacket){
userMessagesFromNode.add(userPacket);
- Logger.v(TAG, "New User Message is queued");
+ //Logger.v(TAG, "New User Message is queued. Type: " + userPacket.getData().getPacketType());
synchronized (queueLock) {
queueLock.notify();
}
@@ -466,6 +467,7 @@ public class Sender implements Runnable{
}
}*/
+
/**
* Removes every message from the user packet queue that matches the given destination
* @param destinationAddress the destination which to look for
diff --git a/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/tcp/TCPSend.java b/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/tcp/TCPSend.java
index 3030aac..3f0bf35 100644
--- a/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/tcp/TCPSend.java
+++ b/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/tcp/TCPSend.java
@@ -47,7 +47,7 @@ public class TCPSend {
}*/
nextHopIp = destIp;
try{
- Logger.v(TAG, "Connecting to " + nextHopIp + "...");
+ //Logger.v(TAG, "Connecting to " + nextHopIp + "...");
tcpSocket = new Socket(nextHopIp, destPort);
Logger.v(TAG, "Connected with " + nextHopIp);
@@ -106,7 +106,7 @@ public class TCPSend {
packet.getStatus()==TCPPacketType.RouteEstablished &&
packet.getSourceIP().equalsIgnoreCase(destIp)){
- Logger.v(TAG, "Packet verified!!!!");
+ //Logger.v(TAG, "Packet verified!!!!");
return true;
}
else{
diff --git a/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/udp/UdpReceiver.java b/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/udp/UdpReceiver.java
index 5e1ffda..d92e5b0 100644
--- a/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/udp/UdpReceiver.java
+++ b/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/udp/UdpReceiver.java
@@ -74,7 +74,7 @@ public class UdpReceiver implements Runnable {
while (keepRunning) {
try {
Socket socket = tcpSocket.accept();
- Logger.v(TAG, "Receive Connection from " + socket.getRemoteSocketAddress());
+ //Logger.v(TAG, "Receive Connection from " + socket.getRemoteSocketAddress());
pool.execute(new TcpPacketReceiver(socket));
} catch (IOException e) {
@@ -174,7 +174,7 @@ public class UdpReceiver implements Runnable {
System.arraycopy(brodcastReceivePacket.getData(), 0, bdResult, 0, brodcastReceivePacket.getData().length); // brodcastReceivePacket.getLength()
- Logger.v(TAG, "Receive Broadcast of " + brodcastReceivePacket.getSocketAddress());
+ //Logger.v(TAG, "Receive Broadcast of " + brodcastReceivePacket.getSocketAddress());
parent.addMessage(bdNodeId, bdResult);
} catch (IOException e) {
diff --git a/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/udp/UdpSender.java b/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/udp/UdpSender.java
index ceb0a75..008474e 100644
--- a/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/udp/UdpSender.java
+++ b/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/aodv/adhoc/udp/UdpSender.java
@@ -45,13 +45,13 @@ public class UdpSender {
* @throws IOException
* @throws SizeLimitExceededException is thrown if the length of the data to be sent exceeds the limit
*/
- private InetAddress IPAddress;
+ //private InetAddress IPAddress;
private byte[] data = new byte[Constants.UDP_MAX_PACKAGE_SIZE];
- private DatagramPacket sendPacket = new DatagramPacket(data, data.length, IPAddress, receiverPort + 1);
+ private DatagramPacket sendPacket = new DatagramPacket(data,data.length);
public boolean sendPacket(int destinationNodeID, final byte[] data) throws IOException, DataExceedsMaxSizeException {
if (data.length <= Constants.UDP_MAX_PACKAGE_SIZE) {
- IPAddress = InetAddress.getByName(subNet+ destinationNodeID);
+ final InetAddress IPAddress = InetAddress.getByName(subNet+ destinationNodeID);
// do we have a packet to be broadcasted?
if (destinationNodeID == Constants.BROADCAST_ADDRESS) {
@@ -63,29 +63,7 @@ public class UdpSender {
datagramSocket.send(sendPacket);
} else {
// Hack! Use TCP instead of UDP
- pool.execute(new Runnable(){
- @Override
- public void run() {
- Socket tcpSocket=null;
- try {
- tcpSocket = new Socket(IPAddress, receiverPort);
- //Logger.v(TAG, "Start TCP Connection Established");
- tcpSocket.getOutputStream().write(data);
- } catch (IOException e) {
- e.printStackTrace();
- } finally{
- if(tcpSocket != null){
- try {
- tcpSocket.getOutputStream().flush();
- tcpSocket.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- Logger.v(TAG, "data of length: " + data.length + " bytes is sent to " + IPAddress);
- }
- });
+ pool.execute(new UdpPacketRunnable(destinationNodeID, data));
}
return true;
} else {
@@ -93,6 +71,43 @@ public class UdpSender {
}
}
+ private class UdpPacketRunnable implements Runnable{
+ private int destinationNodeID;
+ private byte[] data;
+
+ public UdpPacketRunnable(int destinationNodeIDIn, final byte[] dataIn){
+ this.destinationNodeID = destinationNodeIDIn;
+ this.data = dataIn;
+ }
+ @Override
+ public void run() {
+ Socket tcpSocket=null;
+ try {
+ InetAddress IPAddress = InetAddress.getByName(subNet+ destinationNodeID);
+ tcpSocket = new Socket(IPAddress, receiverPort);
+ //Logger.v(TAG, "Start TCP Connection Established");
+ tcpSocket.getOutputStream().write(data);
+ } catch (IOException e) {
+ e.printStackTrace();
+ Logger.v(TAG, " Error in TCPSocket in UDPSender when write");
+
+ } finally{
+ if(tcpSocket != null){
+ try {
+ tcpSocket.getOutputStream().flush();
+ tcpSocket.close();
+ Logger.v(TAG, "data of length: " + data.length + " bytes is sent to " + tcpSocket.getInetAddress().getHostAddress());
+ } catch (IOException e) {
+ e.printStackTrace();
+ Logger.v(TAG, " Error in TCPSocket in UDPSender when close");
+ }
+ }
+ }
+
+ }
+
+ }
+
public void closeSoket(){
if(!datagramSocket.isClosed())
datagramSocket.close();
diff --git a/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/network/edu/tamu/lenss/mdfs/FileRequestHandler.java b/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/network/edu/tamu/lenss/mdfs/FileRequestHandler.java
index 3141278..b7d11af 100644
--- a/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/network/edu/tamu/lenss/mdfs/FileRequestHandler.java
+++ b/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/network/edu/tamu/lenss/mdfs/FileRequestHandler.java
@@ -13,6 +13,8 @@ import edu.tamu.lenss.mdfs.models.FileREQ;
import edu.tamu.lenss.mdfs.models.MDFSFileInfo;
import edu.tamu.lenss.mdfs.utils.AndroidIOUtils;
+import org.apache.hadoop.mdfs.protocol.MDFSDirectoryProtocol;
+
public class FileRequestHandler {
private ServiceHelper serviceHelper;
@@ -28,13 +30,13 @@ public class FileRequestHandler {
*/
public void processRequest(FileREQ fileReq){
serviceHelper = ServiceHelper.getInstance();
- MDFSDirectory directory = serviceHelper.getDirectory();
+ MDFSDirectoryProtocol directory = serviceHelper.getDirectory();
FileREP reply = new FileREP(fileReq.getFileName(), fileReq.getFileCreatedTime(),
serviceHelper.getMyNode().getNodeId(), fileReq.getSource());
- Set<Integer> fileSet = directory.getStoredFileIndex(fileReq.getFileCreatedTime());
- int storedKeyIdx = directory.getStoredKeyIndex(fileReq.getFileCreatedTime());
+ Set<Integer> fileSet = directory.getStoredFileIndex(fileReq.getFileCreatedTime(),serviceHelper.getMyNode().getNodeId()).getItemSet();
+ int storedKeyIdx = directory.getStoredKeyIndex(fileReq.getFileCreatedTime(),serviceHelper.getMyNode().getNodeId());
// Reply with whatever fragments I have
if(fileReq.isAnyAvailable()){
diff --git a/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/network/edu/tamu/lenss/mdfs/FragExchangeHelper.java b/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/network/edu/tamu/lenss/mdfs/FragExchangeHelper.java
index 2ec58ba..4bd626e 100644
--- a/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/network/edu/tamu/lenss/mdfs/FragExchangeHelper.java
+++ b/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/network/edu/tamu/lenss/mdfs/FragExchangeHelper.java
@@ -22,6 +22,9 @@ import edu.tamu.lenss.mdfs.models.KeyFragPacket;
import edu.tamu.lenss.mdfs.models.MDFSFileInfo;
import edu.tamu.lenss.mdfs.utils.AndroidIOUtils;
+
+import org.apache.hadoop.mdfs.protocol.MDFSDirectoryProtocol;
+
/**
* All functions in this class are blocking calls. Need to be handled in Thread
* @author Jay
@@ -38,6 +41,7 @@ public class FragExchangeHelper {
public void downloadKeyFragment(final KeyFragPacket keyPacket){
KeyShareInfo key = keyPacket.getKeyShareInfo();
String fileDirName = MDFSFileInfo.getDirName(keyPacket.getFileName(), keyPacket.getCreatedTime());
+
File tmp0 = AndroidIOUtils.getExternalFile(Constants.DIR_ROOT + "/" + fileDirName);
int tialCnt = 0;
while(!tmp0.exists() && !tmp0.mkdirs()){
@@ -55,13 +59,18 @@ public class FragExchangeHelper {
key.getFileName()+"__key__" + key.getIndex());
if(tmp0.exists() && tmp0.length() > 0){ // We send KeyFragment multiple times....hacky way to fix things
+ Logger.v(TAG, "Returning as file already exists");
return;
}
if(IOUtilities.writeObjectToFile(key, tmp0)){
// Update Directory
- MDFSDirectory directory = ServiceHelper.getInstance().getDirectory();
- directory.addKeyFragment(keyPacket.getCreatedTime(), key.getIndex());
+ MDFSDirectoryProtocol directory = ServiceHelper.getInstance().getDirectory();
+ directory.addKeyFragment(keyPacket.getCreatedTime(), key.getIndex(),ServiceHelper.getInstance().getMyNode().getNodeId());
+ }
+ else{
+
+ Logger.v(TAG, " Creating key Failure");
}
}
@@ -115,8 +124,8 @@ public class FragExchangeHelper {
} finally{
if(success && tmp0.length() > 0){ // Hacky way to avoid 0 byte file
// update directory
- MDFSDirectory directory = ServiceHelper.getInstance().getDirectory();
- directory.addFileFragment(header.getCreatedTime(), header.getFragIndex());
+ MDFSDirectoryProtocol directory = ServiceHelper.getInstance().getDirectory();
+ directory.addFileFragment(header.getCreatedTime(), header.getFragIndex(),ServiceHelper.getInstance().getMyNode().getNodeId());
}
else if(tmp0 != null)
tmp0.delete();
@@ -134,8 +143,8 @@ public class FragExchangeHelper {
fileFrag.delete();
data.close();
// Update directory
- MDFSDirectory directory = ServiceHelper.getInstance().getDirectory();
- directory.removeFileFragment(header.getCreatedTime());
+ MDFSDirectoryProtocol directory = ServiceHelper.getInstance().getDirectory();
+ directory.removeFileFragment(header.getCreatedTime(),ServiceHelper.getInstance().getMyNode().getNodeId());
return;
}
diff --git a/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/network/edu/tamu/lenss/mdfs/MDFSDirectory.java b/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/network/edu/tamu/lenss/mdfs/MDFSDirectory.java
index 125410d..371c282 100644
--- a/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/network/edu/tamu/lenss/mdfs/MDFSDirectory.java
+++ b/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/network/edu/tamu/lenss/mdfs/MDFSDirectory.java
@@ -23,40 +23,57 @@ import adhoc.etc.Logger;
import edu.tamu.lenss.mdfs.models.MDFSFileInfo;
import edu.tamu.lenss.mdfs.utils.AndroidIOUtils;
+import org.apache.hadoop.mdfs.protocol.MDFSDirectoryProtocol;
+import org.apache.hadoop.io.SetWritable;
+import org.apache.hadoop.mdfs.protocol.MDFSInfoList;
+
+
+
+
+
/**
* This class track the current status of MDFS File System. <br>
* Available files in the network, local available files, or local available fragments...
* @author Jay
*
*/
-public class MDFSDirectory implements Serializable {
+public class MDFSDirectory implements Serializable,MDFSDirectoryProtocol {
private static final String TAG = MDFSDirectory.class.getSimpleName();
private static final long serialVersionUID = 1L;
private Map<Long, MDFSFileInfo> fileMap; // Use File Creation Time as the key now. Should use UUID
private Map<String, Long> nameToKeyMap; // Used to map from file name to file ID(createdTime)
- private Map<Long, Integer> keyFragMap; // Used to map from fileId to key fragment#
- private Map<Long, Set<Integer>> fileFragMap; // Used to map from fileId to file fragment#
+ private Map<Long, Map<Integer,Integer>> keyFragMap; // Used to map from fileId to key fragment#
+ private Map<Long, Map<Integer,Set<Integer>>> fileFragMap; // Used to map from fileId to file fragment#
private Set<Long> encryptedFileSet; // A set of files that have been combined, but encrypted.
private Set<Long> decryptedFileSet; // A set of files that have been decrypted temporarily
public MDFSDirectory(){
fileMap = new HashMap<Long, MDFSFileInfo>();
nameToKeyMap = new HashMap<String, Long>();
- keyFragMap = new HashMap<Long, Integer>();
- fileFragMap = new HashMap<Long, Set<Integer>>();
+ keyFragMap = new HashMap<Long, Map<Integer,Integer>>();
+ fileFragMap = new HashMap<Long, Map<Integer,Set<Integer>>>();
encryptedFileSet = new HashSet<Long>();
decryptedFileSet = new HashSet<Long>();
}
-
+
+
+ public long getProtocolVersion(String protocol,
+ long clientVersion) throws IOException {
+ return serialVersionUID;
+ }
+
+
/**
* Return null if the fileId does not exist in the directory
* @param fileId
* @return
*/
public MDFSFileInfo getFileInfo(long fileId){
+ //Logger.v(TAG," getFileInfo "+fileId+" fileMap size "+fileMap.size());
return fileMap.get(fileId);
}
+
public MDFSFileInfo getFileInfo(String fName){
Long fileId = nameToKeyMap.get(fName);
if(fileId != null)
@@ -69,13 +86,13 @@ public class MDFSDirectory implements Serializable {
/**
* @return A List of all available files. The List may be empty
*/
- public List<MDFSFileInfo> getFileList(){
+ public MDFSInfoList getFileList(){
List<MDFSFileInfo> list;
if(!fileMap.isEmpty())
list = new ArrayList<MDFSFileInfo>(fileMap.values());
else
list = new ArrayList<MDFSFileInfo>();;
- return list;
+ return (new MDFSInfoList(list));
}
/**
@@ -94,17 +111,27 @@ public class MDFSDirectory implements Serializable {
* @param fileId
* @return -1 if there is no key fragment available
*/
- public int getStoredKeyIndex(long fileId){
- Integer idx = keyFragMap.get(fileId);
- if(idx != null)
- return idx;
+ public int getStoredKeyIndex(long fileId,int creator){
+ //Logger.v(TAG," getStoredKeyIndex "+fileId+" "+creator);
+ Map<Integer,Integer> idx = keyFragMap.get(fileId);
+ if(idx != null){
+ if(idx.get(creator) != null){
+ //Logger.v(TAG," getStoredKeyIndex "+fileId+" "+creator+" Returning "+idx.get(creator));
+ return idx.get(creator);
+ }
+ else
+ return -1;
+ }
else
return -1;
}
- public int getStoredKeyIndex(String fName){
+ public int getStoredKeyIndex(String fName, int creator){
+ //Logger.v(TAG," getStoredKeyIndex "+fName+" "+creator);
Long fileId = nameToKeyMap.get(fName);
- if(fileId != null)
- return getStoredKeyIndex(fileId);
+ if(fileId != null){
+ //Logger.v(TAG," getStoredKeyIndex Name "+fName+" "+creator+" Returning "+getStoredKeyIndex(fileId,creator));
+ return getStoredKeyIndex(fileId,creator);
+ }
else
return -1;
}
@@ -113,19 +140,49 @@ public class MDFSDirectory implements Serializable {
* @param fileId
* @return null if there is no file fragment avaiable
*/
- public Set<Integer> getStoredFileIndex(long fileId){
- return fileFragMap.get(fileId);
+ public SetWritable getStoredFileIndex(long fileId,int creator){
+ Map<Integer,Set<Integer>> mp = fileFragMap.get(fileId);
+ //Logger.v(TAG," getStoredFileIndex "+fileId+" "+creator);
+ if(mp != null){
+ if(fileFragMap.get(fileId).get(creator) != null){
+ //Logger.v(TAG," getStoredFileIndex "+fileId+" "+creator+" Returning "+fileFragMap.get(fileId).get(creator));
+ return (new SetWritable(fileFragMap.get(fileId).get(creator)));
+ }
+ else{
+ return (new SetWritable(new HashSet<Integer>()));
+ }
+ }
+ else
+ return (new SetWritable(new HashSet<Integer>()));
}
- public Set<Integer> getStoredFileIndex(String fName){
+
+ public SetWritable getStoredFileIndex(String fName,int creator){
+ //Logger.v(TAG," getStoredFileIndex "+fName+" "+creator);
Long fileId = nameToKeyMap.get(fName);
if(fileId != null)
- return fileFragMap.get(fileId);
+ {
+ Map<Integer,Set<Integer>> mp = fileFragMap.get(fileId);
+ if(mp != null){
+ if(fileFragMap.get(fileId).get(creator) != null){
+ //Logger.v(TAG," getStoredFileIndex "+fileId+" "+creator+" Returning "+fileFragMap.get(fileId).get(creator));
+ return (new SetWritable(fileFragMap.get(fileId).get(creator)));
+ }
+ else{
+ return (new SetWritable(new HashSet<Integer>()));
+ }
+
+ }
+ else
+ return (new SetWritable(new HashSet<Integer>()));
+
+ }
else
- return null;
+ return (new SetWritable(new HashSet<Integer>()));
}
public void addFile(MDFSFileInfo file){
+ Logger.v(TAG," Adding File Id"+file.getCreatedTime()+" fileMap size "+fileMap.size());
if(fileMap.containsKey(file.getCreatedTime())){
MDFSFileInfo tmp= fileMap.get(file.getCreatedTime());
if(!tmp.getFileName().equals(file.getFileName())){
@@ -149,6 +206,7 @@ public class MDFSDirectory implements Serializable {
* @param fileId
*/
public void removeFile(long fileId){
+ Logger.v(TAG," Removing File Id"+fileId+" fileMap size "+fileMap.size());
if(fileMap.containsKey(fileId)){
String name = fileMap.get(fileId).getFileName();
nameToKeyMap.remove(name);
@@ -156,32 +214,89 @@ public class MDFSDirectory implements Serializable {
fileMap.remove(fileId);
}
- public void addKeyFragment(long fileId, int keyIndex){
- keyFragMap.put(fileId, keyIndex);
+ public void addKeyFragment(long fileId, int keyIndex,int creator){
+ //Logger.v(TAG," store Key Index "+fileId+" "+keyIndex+" "+creator);
+
+ if(keyFragMap.containsKey(fileId)){
+ Map<Integer,Integer> mp = keyFragMap.get(fileId);
+ if(mp != null){
+ Integer key = keyFragMap.get(fileId).get(creator);
+ if(key != null){
+ Logger.v(TAG," Error. Key index is added again for same node");
+ }
+ else{
+ keyFragMap.get(fileId).put(creator,keyIndex);
+
+ }
+
+ }
+ }
+ else{
+ Map<Integer,Integer> mp = new HashMap<Integer,Integer>();
+ mp.put(creator,keyIndex);
+ keyFragMap.put(fileId, mp);
+ }
+
+
}
- public void addKeyFragment(String fileName, int keyIndex){
+
+ public void addKeyFragment(String fileName, int keyIndex,int creator){
+ //Logger.v(TAG," store Key Index string "+fileName+" "+keyIndex+" "+creator);
Long fileId = nameToKeyMap.get(fileName);
if(fileId != null )
- keyFragMap.put(fileId, keyIndex);
+ addKeyFragment(fileId,keyIndex,creator);
+ }
+
+ public void replaceKeyFragment(long src,long dst){
+ Map<Integer,Integer> mp=keyFragMap.get(src);
+ keyFragMap.remove(src);
+ keyFragMap.put(dst,mp);
+
}
- public void removeKeyFragment(long fileId){
- keyFragMap.remove(fileId);
+ public void replaceFileFragment(long src,long dst){
+ Map<Integer,Set<Integer>> mp=fileFragMap.get(src);
+ fileFragMap.remove(src);
+ fileFragMap.put(dst,mp);
+
+ }
+
+ public void removeKeyFragment(long fileId,int creator){
+ //Logger.v(TAG," remove key fragment "+fileId+" "+creator);
+ keyFragMap.get(fileId).remove(creator);
}
- public void removeKeyFragment(String fileName){
+ public void removeKeyFragment(String fileName,int creator){
+ //Logger.v(TAG," remove key Fragment "+fileName+" "+creator);
Long fileId = nameToKeyMap.get(fileName);
if(fileId != null )
- keyFragMap.remove(fileId);
+ keyFragMap.get(fileId).remove(creator);
}
-
- public void addFileFragment(long fileId, int fileIndex){
+
+ public void addFileFragment(long fileId, int fileIndex,int creator){
+ //Logger.v(TAG," store file Index "+fileId+" "+fileIndex+" "+creator);
if(fileFragMap.containsKey(fileId)){
- fileFragMap.get(fileId).add(fileIndex);
+ Map<Integer,Set<Integer>> mp = fileFragMap.get(fileId);
+ if(mp != null){
+ Set<Integer> fFrag = fileFragMap.get(fileId).get(creator);
+ if(fFrag != null){
+ fFrag.add(fileIndex);
+ }
+ else{
+ HashSet<Integer> frag = new HashSet<Integer>();
+ frag.add(fileIndex);
+ fileFragMap.get(fileId).put(creator,frag);
+
+
+ }
+
+ }
}
else{
HashSet<Integer> fFrag = new HashSet<Integer>();
fFrag.add(fileIndex);
- fileFragMap.put(fileId, fFrag);
+ Map<Integer,Set<Integer>> mp = new HashMap<Integer,Set<Integer>>();
+ mp.put(creator,fFrag);
+ fileFragMap.put(fileId, mp);
}
}
@@ -191,42 +306,66 @@ public class MDFSDirectory implements Serializable {
* @param fileName
* @param fileIndex
*/
- public void addFileFragment(String fileName, int fileIndex){
+ public void addFileFragment(String fileName, int fileIndex,int creator){
+ //Logger.v(TAG," store file Index "+fileName+" "+fileIndex+" "+creator);
Long fileId = nameToKeyMap.get(fileName);
if(fileId == null )
return;
- addFileFragment(fileId, fileIndex);
+ addFileFragment(fileId, fileIndex,creator);
}
-
- public void addFileFragment(long fileId, Set<Integer> fileIndex){
+
+ public void addFileFragment(long fileId, SetWritable fileIndex,int creator){
+ //Logger.v(TAG," store file Index "+fileId+" "+fileIndex.size()+" "+creator);
if(fileFragMap.containsKey(fileId)){
- fileFragMap.get(fileId).addAll(fileIndex);
+
+ Map<Integer,Set<Integer>> mp = fileFragMap.get(fileId);
+ if(mp != null){
+ Set<Integer> fFrag = fileFragMap.get(fileId).get(creator);
+ if(fFrag != null){
+ fFrag.addAll(fileIndex.getItemSet());
+ }
+ else{
+ HashSet<Integer> frag = new HashSet<Integer>();
+ frag.addAll(fileIndex.getItemSet());
+ fileFragMap.get(fileId).put(creator,frag);
+
+
+ }
+
+ }
+
}
else{
HashSet<Integer> fFrag = new HashSet<Integer>();
- fFrag.addAll(fileIndex);
- fileFragMap.put(fileId, fFrag);
+ fFrag.addAll(fileIndex.getItemSet());
+ Map<Integer,Set<Integer>> mp = new HashMap<Integer,Set<Integer>>();
+ mp.put(creator,fFrag);
+ fileFragMap.put(fileId, mp);
}
}
- public void addFileFragment(String fileName, Set<Integer> fileIndex){
+
+ public void addFileFragment(String fileName, SetWritable fileIndex,int creator){
+ //Logger.v(TAG," store file Index "+fileName+" "+fileIndex.size()+" "+creator);
Long fileId = nameToKeyMap.get(fileName);
if(fileId == null )
return;
- addFileFragment(fileId, fileIndex);
+ addFileFragment(fileId, fileIndex,creator);
}
- public void removeFileFragment(long fileId){
- fileFragMap.remove(fileId);
+ public void removeFileFragment(long fileId,int creator){
+ //Logger.v(TAG," remove file Index "+fileId+" "+creator);
+ fileFragMap.get(fileId).remove(creator);
}
/**
* Remove ALL fragments of this file
* @param fileName
*/
- public void removeFileFragment(String fileName){
+ public void removeFileFragment(String fileName,int creator){
+ //Logger.v(TAG," remove file Fragment "+fileName+" "+creator);
Long fileId = nameToKeyMap.get(fileName);
if(fileId != null )
- fileFragMap.remove(fileId);
+ fileFragMap.get(fileId).remove(creator);
}
public void addEncryptedFile(long fileId){
@@ -304,7 +443,7 @@ public class MDFSDirectory implements Serializable {
/**
* Make sure the directory is synchronized with the physical files
*/
- public void syncLocal(){
+ public void syncLocal(int nodeId){
File rootDir = AndroidIOUtils.getExternalFile(Constants.DIR_ROOT);
if(!rootDir.exists())
return; // Don't need to sync at all
@@ -345,10 +484,10 @@ public class MDFSDirectory implements Serializable {
try{
index = Integer.parseInt(fragName.substring(fragName.lastIndexOf("_")+1));
if(fragName.contains("__key__")){
- addKeyFragment(fileName, index);
+ addKeyFragment(fileName, index,nodeId);
}
else if (fragName.contains("__frag__")){
- addFileFragment(fileName, index);
+ addFileFragment(fileName, index,nodeId);
}
}
catch(NullPointerException e){
diff --git a/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/network/edu/tamu/lenss/mdfs/MDFSFileCreator.java b/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/network/edu/tamu/lenss/mdfs/MDFSFileCreator.java
index 97f3940..ef416bd 100644
--- a/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/network/edu/tamu/lenss/mdfs/MDFSFileCreator.java
+++ b/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/network/edu/tamu/lenss/mdfs/MDFSFileCreator.java
@@ -39,6 +39,7 @@ import edu.tamu.lenss.mdfs.utils.AndroidIOUtils;
import edu.tamu.lenss.mdfs.utils.JCountDownTimer;
import edu.tamu.lenss.mdfs.Constants;
+import org.apache.hadoop.mdfs.protocol.MDFSDirectoryProtocol;
public class MDFSFileCreator {
@@ -201,14 +202,14 @@ public class MDFSFileCreator {
File fragsDir = AndroidIOUtils.getExternalFile(Constants.DIR_ROOT + "/"
+ MDFSFileInfo.getDirName(fileName, fileInfo.getCreatedTime()));
- MDFSDirectory directory = serviceHelper.getDirectory();
+ MDFSDirectoryProtocol directory = serviceHelper.getDirectory();
// Create file fragments
for (FragmentInfo frag : fragInfos) {
File tmp = IOUtilities.createNewFile(fragsDir, frag.getFileName()
+ "__frag__" + frag.getFragmentNumber());
if (IOUtilities.writeObjectToFile(frag, tmp)) {
directory.addFileFragment(fileInfo.getCreatedTime(),
- frag.getFragmentNumber());
+ frag.getFragmentNumber(),serviceHelper.getMyNode().getNodeId());
}
}
listener.statusUpdate("Encryption Complete");
@@ -307,6 +308,7 @@ public class MDFSFileCreator {
for (KeyShareInfo key : keyShares) {
if (nodesIter != null && nodesIter.hasNext()) {
destNode = nodesIter.next();
+ //Logger.v(TAG, "Key Frag: destNode "+destNode+" my node id "+node.getNodeId());
if (destNode != node.getNodeId()) {
final KeyFragPacket packet = new KeyFragPacket(node.getNodeId(),
destNode, key, fileInfo.getCreatedTime());
@@ -318,15 +320,18 @@ public class MDFSFileCreator {
// node.sendAODVDataContainer(packet);
}
});*/
+ //Logger.v(TAG, "Sending key packet to destNode "+destNode);
node.sendAODVDataContainer(packet);
+ //code till here
} else {
// Just store the key fragment locally.
+ //Logger.v(TAG, "Saving key packet locally");
File tmp = IOUtilities.createNewFile(fileFragDir,
key.getFileName() + "__key__" + key.getIndex());
if (IOUtilities.writeObjectToFile(key, tmp)) {
- MDFSDirectory directory = serviceHelper.getDirectory();
+ MDFSDirectoryProtocol directory = serviceHelper.getDirectory();
directory.addKeyFragment(fileInfo.getCreatedTime(),
- key.getIndex());
+ key.getIndex(),serviceHelper.getMyNode().getNodeId());
}
}
}
diff --git a/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/network/edu/tamu/lenss/mdfs/MDFSFileRetriever.java b/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/network/edu/tamu/lenss/mdfs/MDFSFileRetriever.java
index 063c891..68f769b 100644
--- a/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/network/edu/tamu/lenss/mdfs/MDFSFileRetriever.java
+++ b/hadoop-1.2.1/src/hdfs/org/apache/hadoop/mdfs/comm/network/edu/tamu/lenss/mdfs/MDFSFileRetriever.java
@@ -41,6 +41,8 @@ import edu.tamu.lenss.mdfs.models.MDFSFileInfo;
import edu.tamu.lenss.mdfs.utils.AndroidIOUtils;
import edu.tamu.lenss.mdfs.utils.JCountDownTimer;
+import org.apache.hadoop.mdfs.protocol.MDFSDirectoryProtocol;
+
public class MDFSFileRetriever {
private static final String TAG = MDFSFileRetriever.class.getSimpleName();
@@ -113,8 +115,8 @@ public class MDFSFileRetriever {
fileRetLog.discEnd = System.currentTimeMillis();
// Cache the key fragment and retrieve the file fragments
- MDFSDirectory directory = serviceHelper.getDirectory();
- Set<Integer> myfiles = directory.getStoredFileIndex(fileId); // Get the current file fragments I have
+ MDFSDirectoryProtocol directory = serviceHelper.getDirectory();
+ Set<Integer> myfiles = directory.getStoredFileIndex(fileId,serviceHelper.getMyNode().getNodeId()).getItemSet(); // Get the current file fragments I have
if(myfiles == null)
myfiles = new HashSet<Integer>();
Set<Integer> uniqueFile = new HashSet<Integer>(); // add all the available fragments, including mine an others
@@ -140,13 +142,13 @@ public class MDFSFileRetriever {
uniqueFile.addAll(myfiles);
// Add My KeyShare.
- int keyIdx = directory.getStoredKeyIndex(fileId);
+ int keyIdx = directory.getStoredKeyIndex(fileId,serviceHelper.getMyNode().getNodeId());
if(keyIdx >= 0){
// add mine to keyShares
String dirName = MDFSFileInfo.getDirName(fileName,fileId);
String fName = MDFSFileInfo.getShortFileName(fileName)+ "__key__" + keyIdx;
File f = AndroidIOUtils.getExternalFile(Constants.DIR_ROOT + "/" + dirName + "/" + fName);
- System.out.println(" FileName "+f.getAbsolutePath());
+ //System.out.println(" FileName "+f.getAbsolutePath());
KeyShareInfo key = IOUtilities.readObjectFromFile(f, KeyShareInfo.class);
keyShares.add(key);
}
@@ -203,8 +205,10 @@ public class MDFSFileRetriever {
String fDirName = MDFSFileInfo.getDirName(fileName, fileId);
File tmp0 = AndroidIOUtils.getExternalFile(Constants.DIR_ROOT + "/" + fDirName );
if(!tmp0.exists()){
- tmp0.mkdirs();
- listener.onError("File IO Error. Can't save file locally");
+ if(!tmp0.mkdirs()){
+ listener.onError("File IO Error. Can't save file locally");
+ return;
+ }
}
listener.statusUpdate("Downloading fragments");
@@ -279,7 +283,7 @@ public class MDFSFileRetriever {
FragmentInfo frag;
// Don't use the fragment that may not finish downloading yet
Set<Integer> downloaded =
- ServiceHelper.getInstance().getDirectory().getStoredFileIndex(fileId);
+ ServiceHelper.getInstance().getDirectory().getStoredFileIndex(fileId,serviceHelper.getMyNode().getNodeId()).getItemSet();
for (File f : files) {
if(f.getName().contains("__frag__")){
frag = IOUtilities.readObjectFromFile(f, FragmentInfo.class);
@@ -305,7 +309,7 @@ public class MDFSFileRetriever {
}
fileRetLog.decryEnd = System.currentTimeMillis();
- MDFSDirectory directory = ServiceHelper.getInstance().getDirectory();
+ MDFSDirectoryProtocol directory = ServiceHelper.getInstance().getDirectory();
// save decrypted data as a file
byte [] fileBytes = decoder.getPlainBytes();
File tmp0 = AndroidIOUtils.getExternalFile(Constants.DIR_DECRYPTED);
@@ -315,7 +319,7 @@ public class MDFSFileRetriever {
fos.write(fileBytes, 0, fileBytes.length);
fos.close();
directory.addDecryptedFile(fileId);
- Logger.i(TAG, "File Decryption Complete");
+ Logger.i(TAG, "File Decryption Complete:Decrypted file loc "+tmp.getAbsolutePath());
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
@@ -333,6 +337,7 @@ public class MDFSFileRetriever {
fos.write(fileBytes, 0, fileBytes.length);
fos.close();
directory.addEncryptedFile(fileId);
+ Logger.i(TAG, "File Decryption Complete:Encrypted file loc "+tmp.getAbsolutePath());
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
@@ -342,7 +347,7 @@ public class MDFSFileRetriever {
}
writeLog();
- listener.onComplete(tmp, fileInfo);
+ listener.onComplete(tmp, fileInfo,fileName);
}
private void writeLog(){
@@ -441,7 +446,7 @@ public class MDFSFileRetriever {
oos.writeObject(header);
// Start to download and save the file fragment
- Logger.v(TAG, "Strat downloading frag " + fragmentIndex + " from " + destId);
+ Logger.v(TAG, "Start downloading frag " + fragmentIndex + " from " + destId);
String fDirName = MDFSFileInfo.getDirName(fileName,fileId);
String fName = MDFSFileInfo.getShortFileName(fileName)+ "__frag__" + fragmentIndex;
//tmp0 = IOUtilities.getExternalFile(Constants.DIR_ROOT + "/" + fDirName );
@@ -469,8 +474,8 @@ public class MDFSFileRetriever {
timer.cancel();
if(success && tmp0.length() > 0){ // Hacky way to avoid 0 byte file
// update directory
- MDFSDirectory directory = ServiceHelper.getInstance().getDirectory();
- directory.addFileFragment(header.getCreatedTime(), header.getFragIndex());
+ MDFSDirectoryProtocol directory = ServiceHelper.getInstance().getDirectory();