Author: bleny Date: 2010-05-04 19:33:12 +0200 (Tue, 04 May 2010) New Revision: 21 Url: http://nuiton.org/repositories/revision/diswork/21 Log: -sysout +log Modified: trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/DisworkFileSystem.java trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/DisworkServicesManager.java trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/SimpleDownload.java trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/services/AbstractDisworkService.java trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/services/DownloadService.java trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/services/LookUpService.java trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/split/SplitFileFromLocalFile.java trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/split/SplittedBytes.java trunk/diswork-fs/src/test/java/org/nuiton/disworkfs/DistributedFileSystemTest.java Modified: trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/DisworkFileSystem.java =================================================================== --- trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/DisworkFileSystem.java 2010-05-04 17:02:50 UTC (rev 20) +++ trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/DisworkFileSystem.java 2010-05-04 17:33:12 UTC (rev 21) @@ -5,9 +5,9 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; -import java.net.InetAddress; -import java.net.UnknownHostException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.disworkfs.config.DisworkConfig; import org.nuiton.disworkfs.services.DownloadService; import org.nuiton.disworkfs.services.LookUpService; @@ -21,20 +21,23 @@ private LookUpService lookUpService; private DisworkConfig disworkConfig; + private Log log = LogFactory.getLog(DisworkFileSystem.class); + public DisworkFileSystem(DisworkConfig disworkConfig) { this.disworkConfig = disworkConfig; // System.getProperty("user.home") + /* String localIp; try { localIp = InetAddress.getLocalHost().getHostAddress(); - System.out.println(localIp); + log.info("local IP is " + localIp); } catch (UnknownHostException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + log.error("can't get local IP"); } + */ // System.setProperty("jgroups.bind_addr", localIp); // System.setProperty("jgroups.tcpping.initial_hosts", localIp); // System.setProperty("jgroups.udp.mcast_addr", "224.0.0.150"); @@ -52,17 +55,16 @@ public OutputStream read(String path) { - System.out.println("trying to read " + path); + log.info("trying to read " + path); File file = new File(disworkConfig.getOption("storage"), path); - System.out.println("trying at local file system " + file.getAbsolutePath()); + log.info("trying at local file system " + file.getAbsolutePath()); if (!file.exists()) { // the file is not available // let's download it try { - SimpleDownload simpleDownload = new SimpleDownload(path, lookUpService, downloadService); simpleDownload.initiateDownload(); simpleDownload.startDownload(); @@ -85,11 +87,8 @@ } public void write(String path, File source) throws IOException { - System.out.println(disworkConfig.getOption("storage")); - System.out.println(path); File target = new File(disworkConfig.getOption("storage"), path); - System.out.println("writing to local file " + target.getAbsolutePath()); /* if (file.exists()) { // TODO Modified: trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/DisworkServicesManager.java =================================================================== --- trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/DisworkServicesManager.java 2010-05-04 17:02:50 UTC (rev 20) +++ trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/DisworkServicesManager.java 2010-05-04 17:33:12 UTC (rev 21) @@ -19,8 +19,6 @@ */ private List<AbstractDisworkService> services = new ArrayList<AbstractDisworkService>(); - // private JChannel jChannel; - protected Transport transport; private DisworkConfig disworkConfig; @@ -29,31 +27,11 @@ this.disworkConfig = disworkConfig; transport = new JGroupsTransport(disworkConfig); - /* - try { - jChannel = new JChannel("udp.xml"); - jChannel.connect("MonPremierGroupe"); - jChannel.setReceiver(this); - - // don't receive messages sent by myself - jChannel.setOpt(Channel.LOCAL, new Boolean(false)); - } catch (ChannelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - }*/ + transport.setReceiver(this); - System.out.println("local address = " + transport.getLocalAddress()); } - /* - public void receive(Message msg) { - // TODO log - for (AbstractDisworkService service : services) { - service.receive(msg); - } - } -*/ public void register(AbstractDisworkService service) { // dependency injection, the service need a channel to send a message @@ -73,18 +51,6 @@ public void unRegister(AbstractDisworkService service) { services.remove(service); } - - public void viewAccepted(View new_view) { - for (AbstractDisworkService service : services) { - service.viewAccepted(new_view); - } - } - - public void suspect(Address suspected_mbr) { - for (AbstractDisworkService service : services) { - service.suspect(suspected_mbr); - } - } @Override @@ -93,10 +59,4 @@ service.receiveMessage(message); } } - - /* - public JChannel getJChannel() { - return this.jChannel; - } - */ } \ No newline at end of file Modified: trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/SimpleDownload.java =================================================================== --- trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/SimpleDownload.java 2010-05-04 17:02:50 UTC (rev 20) +++ trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/SimpleDownload.java 2010-05-04 17:33:12 UTC (rev 21) @@ -2,6 +2,8 @@ import java.io.File; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.disworkfs.services.DownloadService; import org.nuiton.disworkfs.services.LookUpService; import org.nuiton.disworkfs.split.FileDescription; @@ -16,6 +18,8 @@ private LookUpService lookUpService; private String filePath; + private Log log = LogFactory.getLog(SimpleDownload.class); + // TODO timeout public SimpleDownload(String filePath, LookUpService lookUpService, DownloadService downloadService) throws Exception { this.filePath = filePath; @@ -31,7 +35,7 @@ // response not yet received, wait again... try { Thread.sleep(1000); - System.out.println("waiting for response"); + log.info("waiting for look-up response"); } catch (InterruptedException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -48,8 +52,8 @@ // TODO throw file not found if timeout exceed while(! downloadFinised) { try { - Thread.sleep(500); - System.out.println("waiting for download"); + Thread.sleep(1000); + log.info("waiting for download complete"); } catch (InterruptedException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -63,7 +67,6 @@ @Override public void updateDownloadStatus(DownloadService downloadService) { synchronized (downloadFinised) { - System.out.println("progess is now " + downloadService.getProgess(fileDescription)); downloadFinised = downloadService.isFinished(fileDescription); } } @@ -71,7 +74,6 @@ @Override public void receiveResult(FileDescription fileDescription) { this.fileDescription = fileDescription; - System.out.println("result received"); } } Modified: trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/services/AbstractDisworkService.java =================================================================== --- trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/services/AbstractDisworkService.java 2010-05-04 17:02:50 UTC (rev 20) +++ trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/services/AbstractDisworkService.java 2010-05-04 17:33:12 UTC (rev 21) @@ -2,6 +2,8 @@ import java.io.Serializable; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.jgroups.Address; import org.jgroups.View; import org.nuiton.disworkfs.config.DisworkConfig; @@ -20,37 +22,15 @@ protected Transport transport; protected DisworkConfig disworkConfig; + + private Log log = LogFactory.getLog(AbstractDisworkService.class); public AbstractDisworkService() {} - - /* - public AbstractDisworkService(JChannel jChannel) { - this.jChannel = jChannel; - } - */ public AbstractDisworkService(Transport transport) { this.transport = transport; } - /* - public void receive(Message msg) { - Object obj = msg.getObject(); - if (obj instanceof LookUpMessage) { - receiveLookUpMessage(msg); - } else if (obj instanceof LookUpResponseMessage) { - receiveLookUpResponseMessage(msg); - } else if (obj instanceof FileRequestMessage) { - receiveFileRequestMessage(msg); - } else if (obj instanceof FileTransferMessage) { - receiveFileTransferMessage(msg); - } else { - System.out.println("unknow message received"); - System.out.println(obj); - } - } - */ - @Override public void receiveMessage(Message message) { @@ -64,8 +44,7 @@ } else if (obj instanceof FileTransferMessage) { receiveFileTransferMessage(message); } else { - System.out.println("unknow message received"); - System.out.println(obj); + log.error("unknow message received"); } } @@ -73,30 +52,17 @@ public void receiveLookUpResponseMessage(Message msg) {} public void receiveFileRequestMessage(Message msg) {} public void receiveFileTransferMessage(Message msg) {} - - public void viewAccepted(View new_view) { - } - - public void suspect(Address suspected_mbr) { - } - - /* - public void setJChannel(JChannel jChannel) { - this.jChannel = jChannel; - } - */ - + public void setTransport(Transport transport) { this.transport = transport; } - @Override - public void run() { - } - public void setDisworkConfig(DisworkConfig disworkConfig) { this.disworkConfig = disworkConfig; } + + @Override + public void run() {} } Modified: trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/services/DownloadService.java =================================================================== --- trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/services/DownloadService.java 2010-05-04 17:02:50 UTC (rev 20) +++ trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/services/DownloadService.java 2010-05-04 17:33:12 UTC (rev 21) @@ -63,7 +63,7 @@ try { File newFile = new File(disworkConfig.getStoragePath(), fileTransferMessage.getFileDescrition().getFileName()); downloadingFile.writeToLocalFileSystem(newFile); - System.out.println("file written"); + log.info("file " + newFile.getAbsolutePath() + " written"); } catch (IOException e) { log.error("can't write file"); } catch (Exception e) { Modified: trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/services/LookUpService.java =================================================================== --- trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/services/LookUpService.java 2010-05-04 17:02:50 UTC (rev 20) +++ trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/services/LookUpService.java 2010-05-04 17:33:12 UTC (rev 21) @@ -29,21 +29,15 @@ * @return the FileDescription or null of file have not been found */ public void lookForFileName(String fileName, LookUpObserver lookUpObserver) { - // TODO use a MessageDispatcher - // System.out.println("lookForFileName(" + fileName + ")"); LookUpMessage lookUpMessage = new LookUpMessage(fileName); - /* - Message message = new Message(null, null, lookUpMessage); - */ Message message = transport.newMulticastMessage(); message.setContent(lookUpMessage); message.send(); log.info("look-up message sent for " + fileName); requestToRequester.put(fileName, lookUpObserver); - // System.out.println("expected == " + fileName); } @Override @@ -53,7 +47,6 @@ String requestedFileName = lookUpResponse.getFileDescription().getFileName(); - // System.out.println("actual == " + requestedFileName); if (requestToRequester.containsKey(requestedFileName)) { LookUpObserver requester = requestToRequester.get(requestedFileName); requester.receiveResult(lookUpResponse.getFileDescription()); Modified: trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/split/SplitFileFromLocalFile.java =================================================================== --- trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/split/SplitFileFromLocalFile.java 2010-05-04 17:02:50 UTC (rev 20) +++ trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/split/SplitFileFromLocalFile.java 2010-05-04 17:33:12 UTC (rev 21) @@ -17,7 +17,6 @@ } public FileDescription getFileDescription() throws IOException { - System.out.println("returning a file description with " + localFile.getPath()); String localFileName = localFile.getPath(); long localFileTotalSize = localFile.length(); long localFileCheckSum = FileUtils.checksum(localFile, new CRC32()).getValue(); Modified: trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/split/SplittedBytes.java =================================================================== --- trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/split/SplittedBytes.java 2010-05-04 17:02:50 UTC (rev 20) +++ trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/split/SplittedBytes.java 2010-05-04 17:33:12 UTC (rev 21) @@ -84,22 +84,18 @@ if (data.length > numberOfChunks * BytesChunk.MAX_CHUNK_SIZE) { numberOfChunks += 1; } - - // System.out.println("numberOfChunks = " + numberOfChunks); - + for (int currentChunk = 0; currentChunk < numberOfChunks; ++currentChunk) { - - // System.out.println("currentChunk = " + currentChunk); - + int numberOfLastBytes = BytesChunk.MAX_CHUNK_SIZE; if (data.length - (currentChunk * BytesChunk.MAX_CHUNK_SIZE) < BytesChunk.MAX_CHUNK_SIZE) { - // System.out.println("last chunk"); + // last chunk numberOfLastBytes = data.length - currentChunk * BytesChunk.MAX_CHUNK_SIZE; } - // System.out.println("reading " + numberOfLastBytes + " bytes"); + // reading numberOfLastBytes bytes byte[] chunkData = new byte[BytesChunk.MAX_CHUNK_SIZE]; @@ -112,11 +108,6 @@ this.chunks.add(bytesChunk); totalSize += numberOfLastBytes; - /* - for (int i = 0; i < chunkData.length; i++) { - System.out.println("chunkData[" + i + "] = " + chunkData[i]); - } - */ } } @@ -135,22 +126,9 @@ int bytesReads = 0; totalSize = 0; for (BytesChunk fileChunk : this.getChunks()) { - // System.out.println("reading chunks n° " + - // fileChunk.getChunkNumber()); - // System.out.println("reading " + fileChunk.getChunkSize()); - - // System.out.println("writing at "+fileChunk.getChunkSize()+" bytes to data["+bytesReads+"]" - // + fileChunk.getData()); System.arraycopy(fileChunk.getData(), 0, data, bytesReads, fileChunk.getChunkSize()); - /* - for (int i = 0; i < fileChunk.getChunkSize(); i++) { - byte[] tempdata = fileChunk.getData(); - System.out.println("tempdata[" + i + "] = " + tempdata[i]); - } - */ - bytesReads += fileChunk.getChunkSize(); totalSize += bytesReads; } @@ -163,7 +141,6 @@ } public boolean isComplete() { - // return this.missingChunks().isEmpty(); return totalSize == this.getActualSize(); } Modified: trunk/diswork-fs/src/test/java/org/nuiton/disworkfs/DistributedFileSystemTest.java =================================================================== --- trunk/diswork-fs/src/test/java/org/nuiton/disworkfs/DistributedFileSystemTest.java 2010-05-04 17:02:50 UTC (rev 20) +++ trunk/diswork-fs/src/test/java/org/nuiton/disworkfs/DistributedFileSystemTest.java 2010-05-04 17:33:12 UTC (rev 21) @@ -27,7 +27,7 @@ /** * The file will have this fixed size */ - static protected int randomFileSize = 10 * 1000 * 1000; + static protected int randomFileSize = 10 * 1000; static protected String storagePath1; static protected String storagePath2;